Use pass-by-reference where possible (#266)

Use pass-by-reference where possible
also contains some other small changes

7 files changed, 57 insertions, 58 deletions

diff --git a/src-tauri/src/github/mod.rs b/src-tauri/src/github/mod.rs
index c46d7c60..b336ab5c 100644
--- a/src-tauri/src/github/mod.rs
+++ b/src-tauri/src/github/mod.rs
@@ -86,7 +86,7 @@ pub fn compare_tags(first_tag: Tag, second_tag: Tag) -> Result<String, String> {
         repo, first_tag.name, second_tag.name
     );
 
-    let comparison: Comparison = client.get(&comparison_url).send().unwrap().json().unwrap();
+    let comparison: Comparison = client.get(comparison_url).send().unwrap().json().unwrap();
     let commits = comparison.commits;
 
     // Display the list of commits.
diff --git a/src-tauri/src/github/pull_requests.rs b/src-tauri/src/github/pull_requests.rs
index a7ac1fd2..96ac623f 100644
--- a/src-tauri/src/github/pull_requests.rs
+++ b/src-tauri/src/github/pull_requests.rs
@@ -259,7 +259,7 @@ pub async fn apply_launcher_pr(
     for file_name in files_to_copy {
         let source_file_path = format!("{}/{}", extract_directory, file_name);
         let destination_file_path = format!("{}/{}", game_install_path, file_name);
-        match std::fs::copy(&source_file_path, &destination_file_path) {
+        match std::fs::copy(source_file_path, destination_file_path) {
             Ok(_result) => (),
             Err(err) => {
                 return Err(format!(
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 56bc590c..aa3802bd 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -69,7 +69,7 @@ struct InstallProgress {
 }
 
 /// Check version number of a mod
-pub fn check_mod_version_number(path_to_mod_folder: String) -> Result<String, anyhow::Error> {
+pub fn check_mod_version_number(path_to_mod_folder: &str) -> Result<String, anyhow::Error> {
     // println!("{}", format!("{}/mod.json", path_to_mod_folder));
     let data = std::fs::read_to_string(format!("{path_to_mod_folder}/mod.json"))?;
     let parsed_json: serde_json::Value = serde_json::from_str(&data)?;
@@ -333,7 +333,7 @@ pub fn get_host_os() -> String {
 }
 
 pub fn launch_northstar(
-    game_install: GameInstall,
+    game_install: &GameInstall,
     bypass_checks: Option<bool>,
 ) -> Result<String, String> {
     dbg!(game_install.clone());
@@ -358,7 +358,7 @@ pub fn launch_northstar(
     // Only check guards if bypassing checks is not enabled
     if !bypass_checks {
         // Some safety checks before, should have more in the future
-        if get_northstar_version_number(game_install.game_path.clone()).is_err() {
+        if get_northstar_version_number(&game_install.game_path).is_err() {
             return Err(anyhow!("Not all checks were met").to_string());
         }
 
@@ -401,7 +401,7 @@ pub fn launch_northstar(
 
 /// Prepare Northstar and Launch through Steam using the Browser Protocol
 pub fn launch_northstar_steam(
-    game_install: GameInstall,
+    game_install: &GameInstall,
     _bypass_checks: Option<bool>,
 ) -> Result<String, String> {
     if !matches!(game_install.install_type, InstallType::STEAM) {
@@ -440,7 +440,7 @@ pub fn launch_northstar_steam(
     }
 
     // Switch to Titanfall2 directory to set everything up
-    if std::env::set_current_dir(game_install.game_path).is_err() {
+    if std::env::set_current_dir(game_install.game_path.clone()).is_err() {
         // We failed to get to Titanfall2 directory
         return Err("Couldn't access Titanfall2 directory".to_string());
     }
@@ -488,17 +488,20 @@ pub fn launch_northstar_steam(
 
 pub fn check_origin_running() -> bool {
     let s = sysinfo::System::new_all();
-    s.processes_by_name("Origin.exe").next().is_some()
-        || s.processes_by_name("EADesktop.exe").next().is_some()
+    let x = s.processes_by_name("Origin.exe").next().is_some()
+        || s.processes_by_name("EADesktop.exe").next().is_some();
+    x
 }
 
 /// Checks if Northstar process is running
 pub fn check_northstar_running() -> bool {
     let s = sysinfo::System::new_all();
-    s.processes_by_name("NorthstarLauncher.exe")
+    let x = s
+        .processes_by_name("NorthstarLauncher.exe")
         .next()
         .is_some()
-        || s.processes_by_name("Titanfall2.exe").next().is_some()
+        || s.processes_by_name("Titanfall2.exe").next().is_some();
+    x
 }
 
 /// Helps with converting release candidate numbers which are different on Thunderstore
@@ -511,7 +514,7 @@ pub fn convert_release_candidate_number(version_number: String) -> String {
 }
 
 /// Returns a serde json object of the parsed `enabledmods.json` file
-pub fn get_enabled_mods(game_install: GameInstall) -> Result<serde_json::value::Value, String> {
+pub fn get_enabled_mods(game_install: &GameInstall) -> Result<serde_json::value::Value, String> {
     let enabledmods_json_path = format!("{}/R2Northstar/enabledmods.json", game_install.game_path);
 
     // Check for JSON file
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 76e8833e..3aa17459 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -202,7 +202,7 @@ async fn get_flightcore_version_number() -> String {
 
 #[tauri::command]
 async fn get_northstar_version_number_caller(game_path: String) -> Result<String, String> {
-    match get_northstar_version_number(game_path) {
+    match get_northstar_version_number(&game_path) {
         Ok(version_number) => Ok(version_number),
         Err(err) => Err(err.to_string()),
     }
@@ -234,7 +234,7 @@ async fn check_is_northstar_outdated(
         .expect("Couldn't find Northstar on thunderstore???");
     // .ok_or_else(|| anyhow!("Couldn't find Northstar on thunderstore???"))?;
 
-    let version_number = match get_northstar_version_number(game_path) {
+    let version_number = match get_northstar_version_number(&game_path) {
         Ok(version_number) => version_number,
         Err(err) => {
             log::warn!("{}", err);
@@ -323,7 +323,7 @@ async fn launch_northstar_caller(
     game_install: GameInstall,
     bypass_checks: Option<bool>,
 ) -> Result<String, String> {
-    launch_northstar(game_install, bypass_checks)
+    launch_northstar(&game_install, bypass_checks)
 }
 
 #[tauri::command]
@@ -332,7 +332,7 @@ async fn launch_northstar_steam_caller(
     game_install: GameInstall,
     bypass_checks: Option<bool>,
 ) -> Result<String, String> {
-    launch_northstar_steam(game_install, bypass_checks)
+    launch_northstar_steam(&game_install, bypass_checks)
 }
 
 #[tauri::command]
@@ -341,8 +341,8 @@ async fn install_mod_caller(
     game_install: GameInstall,
     thunderstore_mod_string: String,
 ) -> Result<(), String> {
-    fc_download_mod_and_install(game_install.clone(), thunderstore_mod_string).await?;
-    match clean_up_download_folder(game_install, false) {
+    fc_download_mod_and_install(&game_install, &thunderstore_mod_string).await?;
+    match clean_up_download_folder(&game_install, false) {
         Ok(()) => Ok(()),
         Err(err) => {
             log::info!("Failed to delete download folder due to {}", err);
@@ -359,7 +359,7 @@ async fn clean_up_download_folder_caller(
     game_install: GameInstall,
     force: bool,
 ) -> Result<(), String> {
-    match clean_up_download_folder(game_install, force) {
+    match clean_up_download_folder(&game_install, force) {
         Ok(()) => Ok(()),
         Err(err) => Err(err.to_string()),
     }
diff --git a/src-tauri/src/mod_management/mod.rs b/src-tauri/src/mod_management/mod.rs
index 76e258d1..728e72c0 100644
--- a/src-tauri/src/mod_management/mod.rs
+++ b/src-tauri/src/mod_management/mod.rs
@@ -54,9 +54,9 @@ pub struct ModJson {
 }
 
 /// Gets all currently installed and enabled/disabled mods to rebuild `enabledmods.json`
-pub fn rebuild_enabled_mods_json(game_install: GameInstall) -> Result<(), String> {
+pub fn rebuild_enabled_mods_json(game_install: &GameInstall) -> Result<(), String> {
     let enabledmods_json_path = format!("{}/R2Northstar/enabledmods.json", game_install.game_path);
-    let mods_and_properties = get_installed_mods_and_properties(game_install)?;
+    let mods_and_properties = get_installed_mods_and_properties(game_install.clone())?;
 
     // Create new mapping
     let mut my_map = serde_json::Map::new();
@@ -89,16 +89,16 @@ pub fn set_mod_enabled_status(
     let enabledmods_json_path = format!("{}/R2Northstar/enabledmods.json", game_install.game_path);
 
     // Parse JSON
-    let mut res: serde_json::Value = match get_enabled_mods(game_install.clone()) {
+    let mut res: serde_json::Value = match get_enabled_mods(&game_install) {
         Ok(res) => res,
         Err(err) => {
             log::warn!("Couldn't parse `enabledmod.json`: {}", err);
             log::warn!("Rebuilding file.");
 
-            rebuild_enabled_mods_json(game_install.clone())?;
+            rebuild_enabled_mods_json(&game_install)?;
 
             // Then try again
-            get_enabled_mods(game_install.clone())?
+            get_enabled_mods(&game_install)?
         }
     };
 
@@ -106,10 +106,10 @@ pub fn set_mod_enabled_status(
     if res.get(mod_name.clone()).is_none() {
         // If it doesn't exist, rebuild `enabledmod.json`
         log::info!("Value not found in `enabledmod.json`. Rebuilding file");
-        rebuild_enabled_mods_json(game_install.clone())?;
+        rebuild_enabled_mods_json(&game_install)?;
 
         // Then try again
-        res = get_enabled_mods(game_install)?;
+        res = get_enabled_mods(&game_install)?;
     }
 
     // Update value
@@ -126,7 +126,7 @@ pub fn set_mod_enabled_status(
 }
 
 /// Parses `manifest.json` for Thunderstore mod string
-fn parse_for_thunderstore_mod_string(nsmod_path: String) -> Result<String, anyhow::Error> {
+fn parse_for_thunderstore_mod_string(nsmod_path: &str) -> Result<String, anyhow::Error> {
     let manifest_json_path = format!("{}/manifest.json", nsmod_path);
     let ts_author_txt_path = format!("{}/thunderstore_author.txt", nsmod_path);
 
@@ -149,7 +149,7 @@ fn parse_for_thunderstore_mod_string(nsmod_path: String) -> Result<String, anyho
 }
 
 /// Parse `mods` folder for installed mods.
-fn parse_installed_mods(game_install: GameInstall) -> Result<Vec<NorthstarMod>, anyhow::Error> {
+fn parse_installed_mods(game_install: &GameInstall) -> Result<Vec<NorthstarMod>, anyhow::Error> {
     let ns_mods_folder = format!("{}/R2Northstar/mods/", game_install.game_path);
 
     let paths = match std::fs::read_dir(ns_mods_folder) {
@@ -195,7 +195,7 @@ fn parse_installed_mods(game_install: GameInstall) -> Result<Vec<NorthstarMod>,
             // Attempt legacy method for getting Thunderstore string first
             Some(ts_mod_string) => Some(ts_mod_string),
             // Legacy method failed
-            None => match parse_for_thunderstore_mod_string(directory_str) {
+            None => match parse_for_thunderstore_mod_string(&directory_str) {
                 Ok(thunderstore_mod_string) => Some(thunderstore_mod_string),
                 Err(_err) => None,
             },
@@ -226,13 +226,13 @@ pub fn get_installed_mods_and_properties(
     game_install: GameInstall,
 ) -> Result<Vec<NorthstarMod>, String> {
     // Get actually installed mods
-    let found_installed_mods = match parse_installed_mods(game_install.clone()) {
+    let found_installed_mods = match parse_installed_mods(&game_install) {
         Ok(res) => res,
         Err(err) => return Err(err.to_string()),
     };
 
     // Get enabled mods as JSON
-    let enabled_mods: serde_json::Value = match get_enabled_mods(game_install) {
+    let enabled_mods: serde_json::Value = match get_enabled_mods(&game_install) {
         Ok(enabled_mods) => enabled_mods,
         Err(_) => serde_json::from_str("{}").unwrap(), // `enabledmods.json` not found, create empty object
     };
@@ -253,7 +253,7 @@ pub fn get_installed_mods_and_properties(
     Ok(installed_mods)
 }
 
-async fn get_ns_mod_download_url(thunderstore_mod_string: String) -> Result<String, String> {
+async fn get_ns_mod_download_url(thunderstore_mod_string: &str) -> Result<String, String> {
     // TODO: This will crash the thread if not internet connection exist. `match` should be used instead
     let index = thermite::api::get_package_index().unwrap().to_vec();
 
@@ -285,10 +285,8 @@ async fn get_ns_mod_download_url(thunderstore_mod_string: String) -> Result<Stri
 }
 
 /// Returns a vector of modstrings containing the dependencies of a given mod
-async fn get_mod_dependencies(
-    thunderstore_mod_string: String,
-) -> Result<Vec<String>, anyhow::Error> {
-    dbg!(thunderstore_mod_string.clone());
+async fn get_mod_dependencies(thunderstore_mod_string: &str) -> Result<Vec<String>, anyhow::Error> {
+    dbg!(thunderstore_mod_string);
 
     // TODO: This will crash the thread if not internet connection exist. `match` should be used instead
     let index = thermite::api::get_package_index().unwrap().to_vec();
@@ -314,8 +312,8 @@ async fn get_mod_dependencies(
 /// Download and install mod to the specified target.
 #[async_recursion]
 pub async fn fc_download_mod_and_install(
-    game_install: GameInstall,
-    thunderstore_mod_string: String,
+    game_install: &GameInstall,
+    thunderstore_mod_string: &str,
 ) -> Result<(), String> {
     // Get mods and download directories
     let download_directory = format!(
@@ -329,7 +327,7 @@ pub async fn fc_download_mod_and_install(
         return Err("Passed empty string".to_string());
     }
 
-    let deps = match get_mod_dependencies(thunderstore_mod_string.clone()).await {
+    let deps = match get_mod_dependencies(thunderstore_mod_string).await {
         Ok(deps) => deps,
         Err(err) => return Err(err.to_string()),
     };
@@ -337,7 +335,7 @@ pub async fn fc_download_mod_and_install(
 
     // Recursively install dependencies
     for dep in deps {
-        match fc_download_mod_and_install(game_install.clone(), dep).await {
+        match fc_download_mod_and_install(game_install, &dep).await {
             Ok(()) => (),
             Err(err) => {
                 if err == "Cannot install Northstar as a mod!" {
@@ -358,7 +356,7 @@ pub async fn fc_download_mod_and_install(
     }
 
     // Get download URL for the specified mod
-    let download_url = get_ns_mod_download_url(thunderstore_mod_string.clone()).await?;
+    let download_url = get_ns_mod_download_url(thunderstore_mod_string).await?;
 
     // Create download directory
     match std::fs::create_dir_all(download_directory.clone()) {
@@ -366,10 +364,9 @@ pub async fn fc_download_mod_and_install(
         Err(err) => return Err(err.to_string()),
     };
 
-    let name = thunderstore_mod_string.clone();
     let path = format!(
-        "{}/___flightcore-temp-download-dir/{}.zip",
-        game_install.game_path, name
+        "{}/___flightcore-temp-download-dir/{thunderstore_mod_string}.zip",
+        game_install.game_path
     );
 
     // Download the mod
@@ -394,7 +391,7 @@ pub async fn fc_download_mod_and_install(
 }
 
 /// Deletes a given Northstar mod folder
-fn delete_mod_folder(ns_mod_directory: String) -> Result<(), String> {
+fn delete_mod_folder(ns_mod_directory: &str) -> Result<(), String> {
     let ns_mod_dir_path = std::path::Path::new(&ns_mod_directory);
 
     // Safety check: Check whether `mod.json` exists and exit early if not
@@ -405,7 +402,7 @@ fn delete_mod_folder(ns_mod_directory: String) -> Result<(), String> {
         return Err(format!("mod.json does not exist in {}", ns_mod_directory));
     }
 
-    match std::fs::remove_dir_all(&ns_mod_directory) {
+    match std::fs::remove_dir_all(ns_mod_directory) {
         Ok(()) => Ok(()),
         Err(err) => Err(format!("Failed deleting mod: {err}")),
     }
@@ -429,7 +426,7 @@ pub fn delete_northstar_mod(game_install: GameInstall, nsmod_name: String) -> Re
         // Installed mod matches specified mod
         if installed_ns_mod.name == nsmod_name {
             // Delete folder
-            return delete_mod_folder(installed_ns_mod.directory);
+            return delete_mod_folder(&installed_ns_mod.directory);
         }
     }
 
@@ -488,7 +485,7 @@ pub fn delete_thunderstore_mod(
 
     // Delete given folders
     for mod_folder in mod_folders_to_remove {
-        delete_mod_folder(mod_folder)?;
+        delete_mod_folder(&mod_folder)?;
     }
 
     Ok(())
diff --git a/src-tauri/src/northstar/mod.rs b/src-tauri/src/northstar/mod.rs
index f3f8cde3..7bd0b0a3 100644
--- a/src-tauri/src/northstar/mod.rs
+++ b/src-tauri/src/northstar/mod.rs
@@ -5,24 +5,23 @@ use crate::{check_mod_version_number, constants::CORE_MODS};
 use anyhow::anyhow;
 
 /// Returns the current Northstar version number as a string
-pub fn get_northstar_version_number(game_path: String) -> Result<String, anyhow::Error> {
+pub fn get_northstar_version_number(game_path: &str) -> Result<String, anyhow::Error> {
     log::info!("{}", game_path);
 
     // TODO:
     // Check if NorthstarLauncher.exe exists and check its version number
     let profile_folder = "R2Northstar";
-    let initial_version_number = match check_mod_version_number(format!(
-        "{}/{}/mods/{}",
-        game_path, profile_folder, CORE_MODS[0]
+    let initial_version_number = match check_mod_version_number(&format!(
+        "{game_path}/{profile_folder}/mods/{}",
+        CORE_MODS[0]
     )) {
         Ok(version_number) => version_number,
         Err(err) => return Err(err),
     };
 
     for core_mod in CORE_MODS {
-        let current_version_number = match check_mod_version_number(format!(
-            "{}/{}/mods/{}",
-            game_path, profile_folder, core_mod
+        let current_version_number = match check_mod_version_number(&format!(
+            "{game_path}/{profile_folder}/mods/{core_mod}",
         )) {
             Ok(version_number) => version_number,
             Err(err) => return Err(err),
diff --git a/src-tauri/src/repair_and_verify/mod.rs b/src-tauri/src/repair_and_verify/mod.rs
index b3dbe3b2..ecf5e1ec 100644
--- a/src-tauri/src/repair_and_verify/mod.rs
+++ b/src-tauri/src/repair_and_verify/mod.rs
@@ -15,9 +15,9 @@ pub fn verify_game_files(game_install: GameInstall) -> Result<String, String> {
 #[tauri::command]
 pub fn disable_all_but_core(game_install: GameInstall) -> Result<(), String> {
     // Rebuild `enabledmods.json` first to ensure all mods are added
-    rebuild_enabled_mods_json(game_install.clone())?;
+    rebuild_enabled_mods_json(&game_install)?;
 
-    let current_mods = get_enabled_mods(game_install.clone())?;
+    let current_mods = get_enabled_mods(&game_install)?;
 
     // Disable all mods, set core mods to enabled
     for (key, _value) in current_mods.as_object().unwrap() {
@@ -37,7 +37,7 @@ pub fn disable_all_but_core(game_install: GameInstall) -> Result<(), String> {
 /// If `force` is FALSE, bails on non-empty folder
 /// If `force` is TRUE, deletes folder even if non-empty
 pub fn clean_up_download_folder(
-    game_install: GameInstall,
+    game_install: &GameInstall,
     force: bool,
 ) -> Result<(), anyhow::Error> {
     // Get download directory