From a744c1e16e7d1778bdb061bc655cbbacacc6d578 Mon Sep 17 00:00:00 2001
From: Thorsten Sommer <mail@tsommer.org>
Date: Tue, 5 Nov 2024 19:32:43 +0100
Subject: [PATCH] Refactored directory management into the environment module

---
 runtime/src/environment.rs | 24 ++++++++++++++++++++++++
 runtime/src/main.rs        | 18 ------------------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/runtime/src/environment.rs b/runtime/src/environment.rs
index a2735a74..f0f33fe7 100644
--- a/runtime/src/environment.rs
+++ b/runtime/src/environment.rs
@@ -1,3 +1,27 @@
+use std::sync::OnceLock;
+use rocket::get;
+use crate::api_token::APIToken;
+
+pub static DATA_DIRECTORY: OnceLock<String> = OnceLock::new();
+
+pub static CONFIG_DIRECTORY: OnceLock<String> = OnceLock::new();
+
+#[get("/system/directories/config")]
+pub fn get_config_directory(_token: APIToken) -> String {
+    match CONFIG_DIRECTORY.get() {
+        Some(config_directory) => config_directory.clone(),
+        None => String::from(""),
+    }
+}
+
+#[get("/system/directories/data")]
+pub fn get_data_directory(_token: APIToken) -> String {
+    match DATA_DIRECTORY.get() {
+        Some(data_directory) => data_directory.clone(),
+        None => String::from(""),
+    }
+}
+
 pub fn is_dev() -> bool {
     cfg!(debug_assertions)
 }
diff --git a/runtime/src/main.rs b/runtime/src/main.rs
index a8b8fdd6..49a6f97c 100644
--- a/runtime/src/main.rs
+++ b/runtime/src/main.rs
@@ -63,9 +63,6 @@ static MAIN_WINDOW: Lazy<Mutex<Option<Window>>> = Lazy::new(|| Mutex::new(None))
 // The update response coming from the Tauri updater.
 static CHECK_UPDATE_RESPONSE: Lazy<Mutex<Option<UpdateResponse<tauri::Wry>>>> = Lazy::new(|| Mutex::new(None));
 
-static DATA_DIRECTORY: OnceLock<String> = OnceLock::new();
-
-static CONFIG_DIRECTORY: OnceLock<String> = OnceLock::new();
 
 static DOTNET_INITIALIZED: Lazy<Mutex<bool>> = Lazy::new(|| Mutex::new(false));
 
@@ -382,21 +379,6 @@ fn dotnet_port(_token: APIToken) -> String {
     format!("{dotnet_server_port}")
 }
 
-#[get("/system/directories/data")]
-fn get_data_directory(_token: APIToken) -> String {
-    match DATA_DIRECTORY.get() {
-        Some(data_directory) => data_directory.clone(),
-        None => String::from(""),
-    }
-}
-
-#[get("/system/directories/config")]
-fn get_config_directory(_token: APIToken) -> String {
-    match CONFIG_DIRECTORY.get() {
-        Some(config_directory) => config_directory.clone(),
-        None => String::from(""),
-    }
-}
 
 #[get("/system/dotnet/ready")]
 async fn dotnet_ready(_token: APIToken) {