fix: fixed merging issues

an-anime-team · Aug 2, 2024 · e63c4a4 · e63c4a4
1 parent 6d39afd
commit e63c4a4
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 66 deletions.
diff --git a/src/ui/main/apply_mfplat_patch.rs b/src/ui/main/apply_mfplat_patch.rs
diff --git a/src/ui/main/download_diff.rs b/src/ui/main/download_diff.rs
@@ -32,7 +32,7 @@ pub fn download_diff(sender: ComponentSender<App>, progress_bar_input: Sender<Pr
 
             move |state| {
                 match &state {
-                    DiffUpdate::InstallerUpdate(InstallerUpdate::DownloadingError(err)) => {
+                    InstallerUpdate::DownloadingError(err) => {
                         tracing::error!("Downloading failed: {err}");
 
                         sender.input(AppMsg::Toast {
@@ -41,7 +41,7 @@ pub fn download_diff(sender: ComponentSender<App>, progress_bar_input: Sender<Pr
                         });
                     }
 
-                    DiffUpdate::InstallerUpdate(InstallerUpdate::UnpackingError(err)) => {
+                    InstallerUpdate::UnpackingError(err) => {
                         tracing::error!("Unpacking failed: {err}");
 
                         sender.input(AppMsg::Toast {

diff --git a/src/ui/main/download_wine.rs b/src/ui/main/download_wine.rs
@@ -87,7 +87,7 @@ pub fn download_wine(sender: ComponentSender<App>, progress_bar_input: Sender<Pr
                                         }
 
                                         #[allow(unused_must_use)] {
-                                            progress_bar_input.send(ProgressBarMsg::UpdateFromState(DiffUpdate::InstallerUpdate(state)));
+                                            progress_bar_input.send(ProgressBarMsg::UpdateFromState(state));
                                         }
                                     }
                                 ));

diff --git a/src/ui/main/mod.rs b/src/ui/main/mod.rs
@@ -10,7 +10,6 @@ use adw::prelude::*;
 use gtk::glib::clone;
 
 mod repair_game;
-mod apply_mfplat_patch;
 mod update_patch;
 mod download_wine;
 mod create_prefix;
@@ -317,8 +316,7 @@ impl SimpleComponent for App {
                                                 Some(LauncherState::PrefixNotExists) => "document-save-symbolic",
 
                                                 Some(LauncherState::GameUpdateAvailable(_)) |
-                                                Some(LauncherState::GameNotInstalled(_)) |
-                                                Some(LauncherState::MfplatPatchAvailable) => "document-save-symbolic",
+                                                Some(LauncherState::GameNotInstalled(_)) => "document-save-symbolic",
 
                                                 Some(LauncherState::PatchBroken) |
                                                 Some(LauncherState::PatchUnsafe) |
@@ -331,7 +329,6 @@ impl SimpleComponent for App {
                                                 Some(LauncherState::PatchNotVerified) |
                                                 Some(LauncherState::PatchConcerning) => tr!("launch"),
 
-                                                Some(LauncherState::MfplatPatchAvailable) => tr!("apply-patch"),
                                                 Some(LauncherState::WineNotInstalled)     => tr!("download-wine"),
                                                 Some(LauncherState::PrefixNotExists)      => tr!("create-prefix"),
                                                 Some(LauncherState::GameNotInstalled(_))  => tr!("download"),
@@ -761,20 +758,6 @@ impl SimpleComponent for App {
                 sender,
 
                 move || {
-                    // Check mfplay patch
-                    match mfplat::is_applied(CONFIG.get_wine_prefix_path()) {
-                        Ok(applied) => sender.input(AppMsg::SetMfplatPatch(applied)),
-
-                        Err(err) => {
-                            tracing::error!("Failed to check mfplat patch status: {err}");
-
-                            sender.input(AppMsg::Toast {
-                                title: tr!("patch-state-check-failed"),
-                                description: Some(err.to_string())
-                            });
-                        }
-                    }
-
                     // Get main patch status
                     sender.input(AppMsg::SetMainPatch(match jadeite::get_metadata() {
                         Ok(metadata) => {
@@ -869,12 +852,6 @@ impl SimpleComponent for App {
                                     sender.input(AppMsg::SetLoadingStatus(Some(Some(tr!("loading-launcher-state--game")))));
                                 }
 
-                                StateUpdating::Voice(locale) => {
-                                    sender.input(AppMsg::SetLoadingStatus(Some(Some(tr!("loading-launcher-state--voice", {
-                                        "locale" = locale.to_name()
-                                    })))));
-                                }
-
                                 StateUpdating::Patch => {
                                     sender.input(AppMsg::SetLoadingStatus(Some(Some(tr!("loading-launcher-state--patch")))));
                                 }
@@ -969,8 +946,6 @@ impl SimpleComponent for App {
                     LauncherState::PatchConcerning |
                     LauncherState::Launch => launch::launch(sender),
 
-                    LauncherState::MfplatPatchAvailable => apply_mfplat_patch::apply_mfplat_patch(sender),
-
                     LauncherState::PatchNotInstalled |
                     LauncherState::PatchUpdateAvailable => update_patch::update_patch(sender, self.progress_bar.sender().to_owned()),
 

diff --git a/src/ui/main/repair_game.rs b/src/ui/main/repair_game.rs
@@ -3,6 +3,8 @@ use relm4::{
     Sender
 };
 
+use gtk::glib::clone;
+
 use anime_launcher_sdk::config::ConfigExt;
 use anime_launcher_sdk::honkai::config::Config;
 

diff --git a/src/ui/main/update_patch.rs b/src/ui/main/update_patch.rs
@@ -45,7 +45,7 @@ pub fn update_patch(sender: ComponentSender<App>, progress_bar_input: Sender<Pro
                     }
 
                     #[allow(unused_must_use)] {
-                        progress_bar_input.send(ProgressBarMsg::UpdateFromState(state.into()));
+                        progress_bar_input.send(ProgressBarMsg::UpdateFromState(state));
                     }
                 }
             )));
-Original file line number
+Diff line change
@@ Expand Up @@
                                             }
                                             #[allow(unused_must_use)] {
-                                                progress_bar_input.send(ProgressBarMsg::UpdateFromState(DiffUpdate::InstallerUpdate(state)));
+                                                progress_bar_input.send(ProgressBarMsg::UpdateFromState(state));
                                             }
                                         }
                                     ));
@@ Expand Down @@