aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>2023-10-13 14:35:24 +0200
committerGitHub <noreply@github.com>2023-10-13 14:35:24 +0200
commit1b656b824b12c1d70b9ad5f2d01ad63db1667a3e (patch)
treed81e3acd499719ce6dac1008a6c2797ae8edf25d
parentfbaa5d7ad4d3674f991ae73c672190cdd6ddac01 (diff)
downloadFlightCore-1b656b824b12c1d70b9ad5f2d01ad63db1667a3e.tar.gz
FlightCore-1b656b824b12c1d70b9ad5f2d01ad63db1667a3e.zip
refactor: Move `clean_up_download_folder_wrapper` (#628)
to `repair_and_verify` module
-rw-r--r--src-tauri/src/main.rs16
-rw-r--r--src-tauri/src/repair_and_verify/mod.rs12
2 files changed, 13 insertions, 15 deletions
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 3290912d..6553db99 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -137,7 +137,7 @@ fn main() {
platform_specific::linux_checks,
mod_management::get_installed_mods_and_properties,
mod_management::install_mod_wrapper,
- clean_up_download_folder_wrapper,
+ repair_and_verify::clean_up_download_folder_wrapper,
github::release_notes::get_newest_flightcore_version,
mod_management::delete_northstar_mod,
util::get_server_player_count,
@@ -202,20 +202,6 @@ pub fn convert_release_candidate_number(version_number: String) -> String {
version_number.replace("-rc", "0").replace("00", "")
}
-/// Installs the specified mod
-#[tauri::command]
-async fn clean_up_download_folder_wrapper(
- game_install: GameInstall,
- force: bool,
-) -> Result<(), String> {
- match repair_and_verify::clean_up_download_folder(&game_install, force) {
- Ok(()) => Ok(()),
- Err(err) => Err(err.to_string()),
- }
-}
-
-use anyhow::Result;
-
/// Defines how Titanfall2 was installed (Steam, Origin, ...)
#[derive(Serialize, Deserialize, Debug, Clone, TS)]
#[ts(export)]
diff --git a/src-tauri/src/repair_and_verify/mod.rs b/src-tauri/src/repair_and_verify/mod.rs
index 11dbee0e..c752a3ab 100644
--- a/src-tauri/src/repair_and_verify/mod.rs
+++ b/src-tauri/src/repair_and_verify/mod.rs
@@ -57,6 +57,18 @@ pub fn disable_all_but_core(game_install: GameInstall) -> Result<(), String> {
Ok(())
}
+/// Installs the specified mod
+#[tauri::command]
+pub async fn clean_up_download_folder_wrapper(
+ game_install: GameInstall,
+ force: bool,
+) -> Result<(), String> {
+ match clean_up_download_folder(&game_install, force) {
+ Ok(()) => Ok(()),
+ Err(err) => Err(err.to_string()),
+ }
+}
+
/// Deletes download folder
/// If `force` is FALSE, bails on non-empty folder
/// If `force` is TRUE, deletes folder even if non-empty