Mirror/Cultivation
1
0
Fork 0
mirror of https://github.com/Grasscutters/Cultivation.git synced 2025-12-12 15:14:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix reading profile path

Browse Source
This commit is contained in:
NotThorny
2025-11-14 15:15:20 -07:00
parent fafec01fe3
commit 99b45ddf52
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src-tauri/src/config.rs
View File

@@ -40,22 +40,22 @@ pub fn config_path(profile: String) -> PathBuf {
if profile.as_str() == "default" { if profile.as_str() == "default" {
path.push("configuration.json"); path.push("configuration.json");
} else { } else {
path.push("profile"); path.push("profiles");
path.push(profile); path.push(profile + ".json");
} }
path path
} }
pub fn get_config(profile_name: String) -> Configuration { pub fn get_config(profile_name: String) -> Configuration {
let path = config_path(profile_name); let path = config_path(profile_name.clone());
let config = std::fs::read_to_string(path).unwrap_or("{}".to_string()); let config = std::fs::read_to_string(path).unwrap_or("{}".to_string());
let config: Configuration = serde_json::from_str(&config).unwrap_or_default(); let config: Configuration = serde_json::from_str(&config).unwrap_or_default();
let default = String::from("default"); //let default = String::from("default");
let prof = config.profile.as_ref().unwrap_or(&default); let prof = config.profile.clone().unwrap_or_default();
if *prof != String::from("default") { if prof != String::from("default") && prof != profile_name.clone() {
get_config(prof.clone()); return get_config(prof.clone());
} }
config config