fix: update bug

Horbin-Magician · Sep 23, 2024 · 52702f3 · 52702f3
1 parent 367f580
commit 52702f3
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rotor"
-version = "0.7.0"
+version = "0.7.1"
 authors = ["Horbin"]
 edition = "2021"
 license = "MIT"

diff --git a/src/module/setting/mod.rs b/src/module/setting/mod.rs
@@ -192,25 +192,27 @@ impl Setting {
             });
 
             let setting_win_clone = setting_win.as_weak();
+            let msg_sender = msg_sender.clone();
             setting_win.on_update(move || {
                 if let Some(setting_win) = setting_win_clone.upgrade() {
                     setting_win.set_block(true);
                     setting_win.set_update_state(0);
                 }
 
+                let msg_sender = msg_sender.clone();
                 let setting_win_clone = setting_win_clone.clone();
                 std::thread::spawn(move || {
                     if let Ok(updater) = net_util::Updater::global().lock() {
-                        updater.update_software()
-                            .unwrap_or_else(
-                                |e| {
-                                    log_util::log_error(format!("Failed to update software: {:?}", e));
-                                    setting_win_clone.upgrade_in_event_loop(move |setting_window| {
-                                        setting_window.set_block(false);
-                                        setting_window.set_update_state(2);
-                                    }).unwrap_or_else(|e| log_util::log_error(format!("Set setting_window back from updating: {:?}", e)));
-                                }
-                            );
+                        match updater.update_software() {
+                            Ok(_) => { let _ = msg_sender.send(AppMessage::Quit); },
+                            Err(e) => {
+                                log_util::log_error(format!("Failed to update software: {:?}", e));
+                                setting_win_clone.upgrade_in_event_loop(move |setting_window| {
+                                    setting_window.set_block(false);
+                                    setting_window.set_update_state(2);
+                                }).unwrap_or_else(|e| log_util::log_error(format!("Set setting_window back from updating: {:?}", e)));
+                            }
+                        }
                     }
                 });
             });

diff --git a/src/util/net_util.rs b/src/util/net_util.rs
@@ -69,9 +69,11 @@ impl Updater {
             let file_response = reqwest::blocking::Client::new()
                 .get(format!("https://mirror.ghproxy.com/{}", download_url)).send()
                 .or_else( |_| {
-                        reqwest::blocking::Client::new().get(download_url).send()
-                    }
-                )?;
+                    reqwest::blocking::Client::new().get(format!("https://ghp.ci/{}", download_url)).send()
+                })
+                .or_else( |_| {
+                    reqwest::blocking::Client::new().get(download_url).send()
+                })?;
 
             if file_response.status().is_success() {
                 let exe_path = env::current_exe()?;