GpgFrontend/GpgFrontend
1
0
Fork 0
Code Issues Pull Requests Actions Releases Activity

feat: switch to portable mode by adding a txt file under bin path

Browse Source
This commit is contained in:
saturneric 2024-01-04 21:17:27 +08:00
parent dcdd494d7f
commit 36509c76e6
2 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/core/function/GlobalSettingStation.cpp
View File

@ -44,6 +44,21 @@ class GlobalSettingStation::Impl {
*/ */
explicit Impl() noexcept { explicit Impl() noexcept {
SPDLOG_INFO("app path: {}", app_path_.u8string()); SPDLOG_INFO("app path: {}", app_path_.u8string());
auto protable_file_path = app_path_ / "PORTABLE.txt";
if (std::filesystem::exists(protable_file_path)) {
SPDLOG_INFO(
"dectected protable mode, reconfiguring config and data path...");
app_configure_path_ = app_path_.parent_path();
config_dir_path_ = app_configure_path_ / "conf";
main_config_path_ = config_dir_path_ / "main.cfg";
module_config_path_ = config_dir_path_ / "module.cfg";
app_data_path_ = app_path_.parent_path();
app_log_path_ = app_data_path_ / "logs";
app_data_objs_path_ = app_data_path_ / "data_objs";
}
SPDLOG_INFO("app configure path: {}", app_configure_path_.u8string()); SPDLOG_INFO("app configure path: {}", app_configure_path_.u8string());
SPDLOG_INFO("app data path: {}", app_data_path_.u8string()); SPDLOG_INFO("app data path: {}", app_data_path_.u8string());
SPDLOG_INFO("app log path: {}", app_log_path_.u8string()); SPDLOG_INFO("app log path: {}", app_log_path_.u8string());
@ -162,15 +177,6 @@ class GlobalSettingStation::Impl {
return app_configure_path_; return app_configure_path_;
} }
/**
* @brief Get the Standalone Gpg Bin Dir object
*
* @return std::filesystem::path
*/
[[nodiscard]] auto GetStandaloneGpgBinDir() const -> std::filesystem::path {
return app_resource_path_ / "gpg1.4" / "gpg";
}
/** /**
* @brief Get the Locale Dir object * @brief Get the Locale Dir object
* *
@ -220,8 +226,10 @@ class GlobalSettingStation::Impl {
.parent_path(); .parent_path();
std::filesystem::path app_data_path_ = std::filesystem::path app_data_path_ =
std::filesystem::path{
QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation)
.toStdString(); ///< Program Data Location .toStdString()} /
"GpgFrontend"; ///< Program Data Location
std::filesystem::path app_log_path_ = std::filesystem::path app_log_path_ =
app_data_path_ / "logs"; ///< Program Data Location app_data_path_ / "logs"; ///< Program Data Location
@ -247,8 +255,10 @@ class GlobalSettingStation::Impl {
#endif #endif
std::filesystem::path app_configure_path_ = std::filesystem::path app_configure_path_ =
std::filesystem::path{
QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation)
.toStdString(); ///< Program Configure Location .toStdString()} /
"GpgFrontend"; ///< Program Configure Location
std::filesystem::path config_dir_path_ = std::filesystem::path config_dir_path_ =
app_configure_path_ / "conf"; ///< Configure File Directory Location app_configure_path_ / "conf"; ///< Configure File Directory Location
std::filesystem::path main_config_path_ = std::filesystem::path main_config_path_ =
@ -299,11 +309,6 @@ auto GlobalSettingStation::GetAppConfigPath() const -> std::filesystem::path {
return p_->GetAppConfigPath(); return p_->GetAppConfigPath();
} }
auto GlobalSettingStation::GetStandaloneGpgBinDir() const
-> std::filesystem::path {
return p_->GetStandaloneGpgBinDir();
}
auto GlobalSettingStation::GetLocaleDir() const -> std::filesystem::path { auto GlobalSettingStation::GetLocaleDir() const -> std::filesystem::path {
return p_->GetLocaleDir(); return p_->GetLocaleDir();
} }

7
src/core/function/GlobalSettingStation.h
View File

@ -98,13 +98,6 @@ class GPGFRONTEND_CORE_EXPORT GlobalSettingStation
*/ */
[[nodiscard]] auto GetAppConfigPath() const -> std::filesystem::path; [[nodiscard]] auto GetAppConfigPath() const -> std::filesystem::path;
/**
* @brief Get the Standalone Gpg Bin Dir object
*
* @return std::filesystem::path
*/
[[nodiscard]] auto GetStandaloneGpgBinDir() const -> std::filesystem::path;
/** /**
* @brief Get the Locale Dir object * @brief Get the Locale Dir object
* *