diff options
Diffstat (limited to 'src-tauri/src/main.rs')
-rw-r--r-- | src-tauri/src/main.rs | 43 |
1 files changed, 1 insertions, 42 deletions
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index d3aa3e04..7cff8f33 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -203,7 +203,7 @@ fn main() { /// Wrapper for `find_game_install_location` as tauri doesn't allow passing `Result<>` types to front-end #[tauri::command] async fn find_game_install_location_caller() -> Result<GameInstall, String> { - find_game_install_location() + northstar::install::find_game_install_location() } /// Returns true if linux compatible @@ -502,8 +502,6 @@ use anyhow::{Context, Result}; pub mod constants; mod platform_specific; -#[cfg(target_os = "windows")] -use platform_specific::windows; #[cfg(target_os = "linux")] use platform_specific::linux; @@ -559,45 +557,6 @@ pub fn linux_checks_librs() -> Result<(), String> { Ok(()) } -/// Attempts to find the game install location -pub fn find_game_install_location() -> Result<GameInstall, String> { - // Attempt parsing Steam library directly - match steamlocate::SteamDir::locate() { - Some(mut steamdir) => { - let titanfall2_steamid = TITANFALL2_STEAM_ID.parse().unwrap(); - match steamdir.app(&titanfall2_steamid) { - Some(app) => { - // println!("{:#?}", app); - let game_install = GameInstall { - game_path: app.path.to_str().unwrap().to_string(), - install_type: InstallType::STEAM, - }; - return Ok(game_install); - } - None => log::info!("Couldn't locate Titanfall2 Steam install"), - } - } - None => log::info!("Couldn't locate Steam on this computer!"), - } - - // (On Windows only) try parsing Windows registry for Origin install path - #[cfg(target_os = "windows")] - match windows::origin_install_location_detection() { - Ok(game_path) => { - let game_install = GameInstall { - game_path, - install_type: InstallType::ORIGIN, - }; - return Ok(game_install); - } - Err(err) => { - log::info!("{}", err); - } - }; - - Err("Could not auto-detect game install location! Please enter it manually.".to_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"); |