From d2ab94e7e0e786b35d54a855926a0c3be0737b0f Mon Sep 17 00:00:00 2001 From: GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com> Date: Wed, 2 Nov 2022 17:44:00 +0100 Subject: refactor: Use existing function for enabled mods (#34) Instead of re-implementing existing logic just re-use what we already have. --- src-tauri/src/lib.rs | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'src-tauri/src') diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 84920727..cfc5fb57 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -482,17 +482,8 @@ pub fn set_mod_enabled_status( /// - name /// - is enabled? pub fn get_installed_mods(game_install: GameInstall) -> Result, String> { - let enabled_mods_json_path = format!("{}/R2Northstar/enabledmods.json", game_install.game_path); - // Open file - let data = match std::fs::read_to_string(enabled_mods_json_path) { - Ok(data) => data, - Err(err) => return Err(err.to_string()), - }; - // Check if valid JSON and parse - let res: serde_json::Value = match serde_json::from_str(&data) { - Ok(res) => res, - Err(err) => return Err(err.to_string()), - }; + // Get enabled mods as JSON + let res: serde_json::Value = get_enabled_mods(game_install)?; let mut installed_mods = Vec::new(); -- cgit v1.2.3