From 86918595b3aee96659df3dbc537cfec869535224 Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Thu, 27 Feb 2025 21:09:47 -0600
Subject: [PATCH] refactor data directory

---
 repertory/librepertory/include/app_config.hpp |  2 +
 repertory/librepertory/src/app_config.cpp     | 44 ++++++++++---------
 repertory/repertory/include/ui/handlers.hpp   |  2 +-
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/repertory/librepertory/include/app_config.hpp b/repertory/librepertory/include/app_config.hpp
index 572a135e..1cd8f005 100644
--- a/repertory/librepertory/include/app_config.hpp
+++ b/repertory/librepertory/include/app_config.hpp
@@ -46,6 +46,8 @@ 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;
 
diff --git a/repertory/librepertory/src/app_config.cpp b/repertory/librepertory/src/app_config.cpp
index 4d770108..c7610e49 100644
--- a/repertory/librepertory/src/app_config.cpp
+++ b/repertory/librepertory/src/app_config.cpp
@@ -699,36 +699,38 @@ auto app_config::default_api_port(const provider_type &prov) -> std::uint16_t {
   return PROVIDER_API_PORTS.at(static_cast<std::size_t>(prov));
 }
 
-auto app_config::default_data_directory(const provider_type &prov)
-    -> std::string {
+auto app_config::get_data_directory() -> std::string {
 #if defined(_WIN32)
-  auto data_directory =
-      utils::path::combine(utils::get_local_app_data_directory(),
-                           {
-                               REPERTORY_DATA_NAME,
-                               app_config::get_provider_name(prov),
-                           });
+  auto data_directory = utils::path::combine(
+      utils::get_local_app_data_directory(), {
+                                                 REPERTORY_DATA_NAME,
+                                             });
 #else // !defined(_WIN32)
 #if defined(__APPLE__)
-  auto data_directory =
-      utils::path::combine("~", {
-                                    "Library",
-                                    "Application Support",
-                                    REPERTORY_DATA_NAME,
-                                    app_config::get_provider_name(prov),
-                                });
+  auto data_directory = utils::path::combine("~", {
+                                                      "Library",
+                                                      "Application Support",
+                                                      REPERTORY_DATA_NAME,
+                                                  });
 #else  // !defined(__APPLE__)
-  auto data_directory =
-      utils::path::combine("~", {
-                                    ".local",
-                                    REPERTORY_DATA_NAME,
-                                    app_config::get_provider_name(prov),
-                                });
+  auto data_directory = utils::path::combine("~", {
+                                                      ".local",
+                                                      REPERTORY_DATA_NAME,
+                                                  });
 #endif // defined(__APPLE__)
 #endif // defined(_WIN32)
   return data_directory;
 }
 
+auto app_config::default_data_directory(const provider_type &prov)
+    -> std::string {
+  return utils::path::combine(app_config::get_data_directory(),
+                              {
+                                  REPERTORY_DATA_NAME,
+                                  app_config::get_provider_name(prov),
+                              });
+}
+
 auto app_config::default_remote_api_port(const provider_type &prov)
     -> std::uint16_t {
   static const std::array<std::uint16_t,
diff --git a/repertory/repertory/include/ui/handlers.hpp b/repertory/repertory/include/ui/handlers.hpp
index 5bade93e..f168b3cb 100644
--- a/repertory/repertory/include/ui/handlers.hpp
+++ b/repertory/repertory/include/ui/handlers.hpp
@@ -55,7 +55,7 @@ private:
   httplib::Server *server_;
 
 private:
-  console_consumer console{};
+  console_consumer console;
 };
 } // namespace repertory::ui