New config

Author: yungcomputerchair

resources/defaults/config.json

@@ -1,7 +1,4 @@
 {
-    "autoupdate-check": true,
-    "cache-swapping": true,
-    "enable-offline-cache": true,
-    "verify-offline-cache": false,
-    "last-version-initialized": "1.0"
+    "check_for_updates": true,
+    "use_offline_caches": true
 }

src-tauri/src/lib.rs

@@ -176,7 +176,8 @@ async fn prep_launch(
             return Err(format!("Version {} not found", version_uuid).into());
         };
 
-        let cache_dir = util::get_cache_dir_for_version(version)?;
+        let base_cache_dir = &state.config.game_cache_path;
+        let cache_dir = util::get_cache_dir_for_version(base_cache_dir, version)?;
         unsafe {
             env::set_var("UNITY_FF_CACHE_DIR", cache_dir);
         }

src-tauri/src/state.rs

@@ -28,6 +28,7 @@ pub struct AppStatics {
     pub app_data_dir: PathBuf,
     pub resource_dir: PathBuf,
     pub ff_cache_dir: PathBuf,
+    pub offline_cache_dir: PathBuf,
     pub ffrunner_log_path: PathBuf,
 }
 impl AppStatics {
@@ -39,6 +40,9 @@ impl AppStatics {
         let ff_cache_dir = path_resolver
             .resolve("ffcache", BaseDirectory::AppCache)
             .unwrap();
+        let offline_cache_dir = path_resolver
+            .resolve("offline_cache", BaseDirectory::AppCache)
+            .unwrap();
         let ffrunner_log_path = path_resolver
             .resolve("ffrunner.log", BaseDirectory::AppCache)
             .unwrap();
@@ -47,6 +51,7 @@ impl AppStatics {
             app_data_dir,
             resource_dir,
             ff_cache_dir,
+            offline_cache_dir,
             ffrunner_log_path,
         }
     }
@@ -142,33 +147,19 @@ impl AppState {
     }
 }
 
-#[derive(Debug, Serialize, Deserialize, Clone)]
+#[derive(Debug, Serialize, Deserialize, Clone, Default)]
 pub struct Config {
-    #[serde(alias = "autoupdate-check")]
     #[serde(default = "util::true_fn")]
-    autoupdate_check: bool,
+    pub check_for_updates: bool,
 
-    #[serde(alias = "cache-swapping")]
     #[serde(default = "util::true_fn")]
-    cache_swapping: bool,
+    pub use_offline_caches: bool,
 
-    #[serde(alias = "enable-offline-cache")]
-    #[serde(default = "util::true_fn")]
-    enable_offline_cache: bool,
+    #[serde(default = "util::get_default_cache_dir")]
+    pub game_cache_path: String,
 
-    #[serde(alias = "verify-offline-cache")]
-    #[serde(default = "util::false_fn")]
-    verify_offline_cache: bool,
-}
-impl Default for Config {
-    fn default() -> Self {
-        Self {
-            autoupdate_check: true,
-            cache_swapping: true,
-            enable_offline_cache: true,
-            verify_offline_cache: false,
-        }
-    }
+    #[serde(default = "util::get_default_offline_cache_dir")]
+    pub offline_cache_path: String,
 }
 impl Config {
     fn new() -> Self {

src-tauri/src/util.rs

@@ -62,8 +62,19 @@ pub fn resolve_server_addr(addr: &str) -> Result<String> {
     Ok(format!("{}:{}", ip, port))
 }
 
-pub fn get_cache_dir_for_version(version: &Version) -> Result<PathBuf> {
-    let cache_dir = get_app_statics().ff_cache_dir.clone();
+pub fn get_default_cache_dir() -> String {
+    get_app_statics().ff_cache_dir.to_string_lossy().to_string()
+}
+
+pub fn get_default_offline_cache_dir() -> String {
+    get_app_statics()
+        .offline_cache_dir
+        .to_string_lossy()
+        .to_string()
+}
+
+pub fn get_cache_dir_for_version(base_cache_dir: &str, version: &Version) -> Result<PathBuf> {
+    let cache_dir = PathBuf::from(base_cache_dir);
     let build_dir = cache_dir.join(version.get_uuid().to_string());
     std::fs::create_dir_all(&build_dir)?;
     Ok(build_dir)