implement application restart

Author: hacknus

src/gui.rs

@@ -12,6 +12,7 @@ use crate::data::{DataContainer, SerialDirection};
 use crate::serial::{clear_serial_settings, save_serial_settings, Device, SerialDevices};
 use crate::settings_window::settings_window;
 use crate::toggle::toggle;
+use crate::update::check_update;
 use crate::FileOptions;
 use crate::{APP_INFO, PREFS_KEY};
 use eframe::egui::panel::Side;
@@ -121,6 +122,7 @@ pub struct MyApp {
     information_panel: InformationPanel,
     file_opened: bool,
     settings_window_open: bool,
+    update_text: String,
     gui_conf: GuiSettingsContainer,
     device_lock: Arc<RwLock<Device>>,
     devices_lock: Arc<RwLock<Vec<String>>>,
@@ -243,6 +245,7 @@ impl MyApp {
             file_opened: false,
             new_release: None,
             settings_window_open: false,
+            update_text: "".to_string(),
         }
     }
 
@@ -882,6 +885,7 @@ impl MyApp {
             .button(format!("{} Settings", egui_phosphor::regular::GEAR_FINE))
             .clicked()
         {
+            self.new_release = check_update();
             self.settings_window_open = true;
         }
         if self.settings_window_open {
@@ -890,6 +894,7 @@ impl MyApp {
                 &mut self.gui_conf,
                 &mut self.new_release,
                 &mut self.settings_window_open,
+                &mut self.update_text,
             );
         }
 

src/settings_window.rs

@@ -1,5 +1,5 @@
 use crate::gui::GuiSettingsContainer;
-use crate::update::{check_update, update};
+use crate::update::{check_update, restart_application, update};
 use eframe::egui;
 use eframe::egui::{Align2, InnerResponse, Vec2, Visuals};
 use egui_theme_switch::ThemeSwitch;
@@ -11,6 +11,7 @@ pub fn settings_window(
     gui_conf: &mut GuiSettingsContainer,
     new_release: &mut Option<Release>,
     settings_window_open: &mut bool,
+    update_text: &mut String,
 ) -> Option<InnerResponse<Option<()>>> {
     egui::Window::new("Settings")
         .fixed_size(Vec2 { x: 600.0, y: 200.0 })
@@ -44,6 +45,7 @@ pub fn settings_window(
                     if ui.button("Update").clicked() {
                         if let Ok(()) = update(r.clone()) {
                             *new_release = None;
+                            *update_text = "Update done. Please Restart Application.".to_string();
                         }
                     }
                 } else {
@@ -55,10 +57,19 @@ pub fn settings_window(
                     });
                     ui.label("No new update");
                 }
+            });
+            ui.label(update_text.clone());
 
-                ui.end_row();
+            ui.horizontal(|ui| {
                 if ui.button("Exit Settings").clicked() {
                     *settings_window_open = false;
+                    *update_text = "".to_string();
+                }
+
+                if !update_text.is_empty() && ui.button("Restart").clicked() {
+                    let _ = restart_application();
+                    ctx.request_repaint(); // Optional: Request repaint for immediate feedback
+                    ui.ctx().send_viewport_cmd(egui::ViewportCommand::Close);
                 }
             });
         })

src/update.rs

@@ -3,6 +3,7 @@ use self_update::update::Release;
 use semver::Version;
 use std::fs::File;
 use std::path::Path;
+use std::process::{Command, ExitStatus};
 use std::{env, fs, io};
 use zip::ZipArchive;
 
@@ -11,6 +12,17 @@ const REPO_NAME: &str = "serial-monitor-rust";
 
 const MACOS_APP_NAME: &str = "Serial Monitor.app";
 
+pub fn restart_application() -> std::io::Result<ExitStatus> {
+    // Get the current executable path
+    let current_exe = std::env::current_exe().expect("Failed to get current executable path");
+
+    // Launch a new instance of the application
+    Command::new(current_exe)
+        .spawn()
+        .expect("Failed to restart application")
+        .wait()
+}
+
 fn extract_zip(tmp_archive_path: &Path, tmp_archive_dir: &Path) -> io::Result<()> {
     // Open the zip file
     let file = File::open(tmp_archive_path)?;