diff options
author | GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com> | 2023-10-13 12:42:50 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-13 12:42:50 +0200 |
commit | 97d4773d5ee55cf6a9081475f2bc3011b23e1037 (patch) | |
tree | a22984a2b3bda1db4acd0e31971bcfb1ce06f7a9 /src-tauri/src/main.rs | |
parent | 04c5ada00522f3058cd1825fcac466b207bc37f3 (diff) | |
download | FlightCore-97d4773d5ee55cf6a9081475f2bc3011b23e1037.tar.gz FlightCore-97d4773d5ee55cf6a9081475f2bc3011b23e1037.zip |
refactor: Move repair/verify related funcs to mod (#622)
Moves functions related to game install path verification checks to dedicated module in an effort to clean up `main.rs`
Diffstat (limited to 'src-tauri/src/main.rs')
-rw-r--r-- | src-tauri/src/main.rs | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 1d20bf74..93f67a33 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -122,7 +122,7 @@ fn main() { get_flightcore_version_number, northstar::get_northstar_version_number, check_is_northstar_outdated, - verify_install_location, + repair_and_verify::verify_install_location, platform_specific::get_host_os, northstar::install::install_northstar_wrapper, northstar::install::update_northstar, @@ -266,18 +266,6 @@ async fn check_is_northstar_outdated( } } -/// Checks if is valid Titanfall2 install based on certain conditions -#[tauri::command] -async fn verify_install_location(game_path: String) -> bool { - match check_is_valid_game_path(&game_path) { - Ok(()) => true, - Err(err) => { - log::warn!("{}", err); - false - } - } -} - /// Installs the specified mod #[tauri::command] async fn install_mod_wrapper( @@ -418,16 +406,3 @@ pub struct NorthstarMod { pub enabled: bool, pub directory: String, } - -/// Checks whether the provided path is a valid Titanfall2 gamepath by checking against a certain set of criteria -pub fn check_is_valid_game_path(game_install_path: &str) -> Result<(), String> { - let path_to_titanfall2_exe = format!("{game_install_path}/Titanfall2.exe"); - let is_correct_game_path = std::path::Path::new(&path_to_titanfall2_exe).exists(); - log::info!("Titanfall2.exe exists in path? {}", is_correct_game_path); - - // Exit early if wrong game path - if !is_correct_game_path { - return Err(format!("Incorrect game path \"{game_install_path}\"")); // Return error cause wrong game path - } - Ok(()) -} |