diff --git a/repertory/librepertory/include/app_config.hpp b/repertory/librepertory/include/app_config.hpp index 1cd8f005..7d825e3e 100644 --- a/repertory/librepertory/include/app_config.hpp +++ b/repertory/librepertory/include/app_config.hpp @@ -46,14 +46,14 @@ public: [[nodiscard]] static auto default_rpc_port(const provider_type &prov) -> std::uint16_t; - [[nodiscard]] static auto get_data_directory() -> std::string; - [[nodiscard]] static auto get_provider_display_name(const provider_type &prov) -> std::string; [[nodiscard]] static auto get_provider_name(const provider_type &prov) -> std::string; + [[nodiscard]] static auto get_root_data_directory() -> std::string; + public: [[nodiscard]] static auto get_stop_requested() -> bool; diff --git a/repertory/librepertory/src/app_config.cpp b/repertory/librepertory/src/app_config.cpp index c7610e49..84d5e1e8 100644 --- a/repertory/librepertory/src/app_config.cpp +++ b/repertory/librepertory/src/app_config.cpp @@ -699,7 +699,7 @@ auto app_config::default_api_port(const provider_type &prov) -> std::uint16_t { return PROVIDER_API_PORTS.at(static_cast(prov)); } -auto app_config::get_data_directory() -> std::string { +auto app_config::get_root_data_directory() -> std::string { #if defined(_WIN32) auto data_directory = utils::path::combine( utils::get_local_app_data_directory(), { @@ -724,7 +724,7 @@ auto app_config::get_data_directory() -> std::string { auto app_config::default_data_directory(const provider_type &prov) -> std::string { - return utils::path::combine(app_config::get_data_directory(), + return utils::path::combine(app_config::get_root_data_directory(), { REPERTORY_DATA_NAME, app_config::get_provider_name(prov), @@ -743,6 +743,7 @@ auto app_config::default_remote_api_port(const provider_type &prov) }; return PROVIDER_REMOTE_PORTS.at(static_cast(prov)); } + auto app_config::default_rpc_port(const provider_type &prov) -> std::uint16_t { static const std::array(provider_type::unknown)>