Skip to content

Terminal interface to find, download, and stream movies, TV shows, and live TV using local media players.

feat(updater): auto-restart updated binary after popup self-update (#186)

Jona Walpertcbcc1ae505b3
diff --git a/src/tui/app/system.rs b/src/tui/app/system.rs
index d5e977a..6bd736a 100644
--- a/src/tui/app/system.rs
+++ b/src/tui/app/system.rs
@@ -823,6 +823,7 @@ impl App {
self.state.is_updating = true;
self.state.update_available = None;
self.state.update_progress_msg = Some("Starting self-update...".to_string());
+ self.state.update_target_exe = std::env::current_exe().ok();
self.state.notify(
NotificationKind::Info,
"Self-Update",
@@ -894,9 +895,16 @@ impl App {
.ok();
#[cfg(unix)]
- if let Ok(exe_path) = std::env::current_exe() {
- if let Err(e) = crate::updater::restart_process(&exe_path) {
- log::error!("failed to restart process after update: {e}");
+ {
+ let exe_path = self
+ .state
+ .update_target_exe
+ .clone()
+ .or_else(|| std::env::current_exe().ok());
+ if let Some(exe_path) = exe_path {
+ if let Err(e) = crate::updater::restart_process(&exe_path) {
+ log::error!("failed to restart process after update: {e}");
+ }
}
}
std::process::exit(0);
diff --git a/src/tui/state.rs b/src/tui/state.rs
index a7b88ec..2aacd65 100644
--- a/src/tui/state.rs
+++ b/src/tui/state.rs
@@ -273,6 +273,7 @@ pub struct AppState {
pub is_updating: bool,
pub update_release: Option<crate::updater::Release>,
pub update_progress_msg: Option<String>,
+ pub update_target_exe: Option<std::path::PathBuf>,
pub download_progress: Option<f64>,
pub download_status: Option<String>,
pub download_title: Option<String>,
@@ -447,6 +448,7 @@ impl Default for AppState {
is_updating: false,
update_release: None,
update_progress_msg: None,
+ update_target_exe: None,
download_progress: None,
download_status: None,
download_title: None,
diff --git a/src/updater/apply.rs b/src/updater/apply.rs
index b35d0ac..5b4b060 100644
--- a/src/updater/apply.rs
+++ b/src/updater/apply.rs
@@ -53,8 +53,16 @@ pub fn detect_environment(exe_path: &Path) -> InstallationEnvironment {
return InstallationEnvironment::Flatpak;
}
- if std::env::var_os("SNAP").is_some() {
- return InstallationEnvironment::Snap;
+ if let Some(snap_dir) = std::env::var_os("SNAP") {
+ let snap_dir_str = snap_dir.to_string_lossy();
+ let exe_str = exe_path.to_string_lossy();
+ let is_moviebox_snap = std::env::var("SNAP_NAME")
+ .is_ok_and(|name| name.contains("moviebox"))
+ || exe_str.starts_with(snap_dir_str.as_ref())
+ || exe_str.contains("/snap/moviebox");
+ if is_moviebox_snap {
+ return InstallationEnvironment::Snap;
+ }
}
if super::artifact::is_termux_environment() {
@@ -294,13 +302,48 @@ fn spawn_windows_helper(staged_path: &Path, current_exe: &Path) -> Result<(), St
Ok(())
}
+pub fn resolve_executable_path(path: &Path) -> PathBuf {
+ if path.exists() {
+ return path.to_path_buf();
+ }
+
+ let raw = path.to_string_lossy();
+ let without_deleted = raw.strip_suffix(" (deleted)").unwrap_or(&raw);
+ let candidate = PathBuf::from(without_deleted);
+ if candidate.exists() {
+ return candidate;
+ }
+
+ if candidate.extension().and_then(|ext| ext.to_str()) == Some("old") {
+ let stripped = candidate.with_extension("");
+ if stripped.exists() {
+ return stripped;
+ }
+ }
+
+ if let Some(file_name) = candidate.file_name().and_then(|s| s.to_str()) {
+ if let Some(base_name) = file_name.strip_suffix(".old") {
+ let stripped = candidate.with_file_name(base_name);
+ if stripped.exists() {
+ return stripped;
+ }
+ }
+ }
+
+ path.to_path_buf()
+}
+
pub fn restart_process(exe_path: &Path) -> Result<(), String> {
#[cfg(unix)]
{
use std::os::unix::process::CommandExt;
+ let resolved = resolve_executable_path(exe_path);
let args: Vec<String> = std::env::args().skip(1).collect();
- let err = Command::new(exe_path).args(&args).exec();
- Err(format!("failed to exec restarted process: {err}"))
+ let err = Command::new(&resolved).args(&args).exec();
+ Err(format!(
+ "failed to exec restarted process {}: {err}",
+ resolved.display()
+ ))
}
#[cfg(windows)]
@@ -391,4 +434,26 @@ mod tests {
assert!(exe.exists());
let _ = std::fs::remove_dir_all(&dir);
}
+
+ #[test]
+ fn resolve_executable_path_handles_existing_and_deleted_suffixes() {
+ let temp = tempfile::tempdir().unwrap();
+ let real_exe = temp.path().join("moviebox-tui");
+ std::fs::write(&real_exe, b"test-bin").unwrap();
+
+ // Exact match
+ assert_eq!(resolve_executable_path(&real_exe), real_exe);
+
+ // Linux deleted suffix
+ let deleted_path = temp.path().join("moviebox-tui (deleted)");
+ assert_eq!(resolve_executable_path(&deleted_path), real_exe);
+
+ // Linux old.deleted suffix
+ let old_deleted_path = temp.path().join("moviebox-tui.old (deleted)");
+ assert_eq!(resolve_executable_path(&old_deleted_path), real_exe);
+
+ // Linux old suffix
+ let old_path = temp.path().join("moviebox-tui.old");
+ assert_eq!(resolve_executable_path(&old_path), real_exe);
+ }
}
diff --git a/src/updater/mod.rs b/src/updater/mod.rs
index 0089a53..8c115b5 100644
--- a/src/updater/mod.rs
+++ b/src/updater/mod.rs
@@ -7,7 +7,7 @@ pub mod verify;
pub use apply::{
InstallationEnvironment, SelfUpdateOutcome, apply_staged_binary, detect_environment,
- is_homebrew_managed, is_scoop_managed, is_writable, restart_process,
+ is_homebrew_managed, is_scoop_managed, is_writable, resolve_executable_path, restart_process,
};
pub use artifact::{Release, ReleaseAsset, TargetPlatform, is_termux_environment};
pub use check::{check, check_release, is_newer};
diff --git a/tests/update_lifecycle.rs b/tests/update_lifecycle.rs
index 7ee47ae..eef6dc8 100644
--- a/tests/update_lifecycle.rs
+++ b/tests/update_lifecycle.rs
@@ -470,3 +470,25 @@ async fn test_update_modal_rendered_symmetry_and_exact_height() {
assert!(title_line.contains("Update Available"));
}
}
+
+#[tokio::test]
+async fn test_update_target_exe_tracking_on_start() {
+ let mut app = App::new();
+ assert!(app.state().update_target_exe.is_none());
+
+ app.handle_action(Action::StartSelfUpdate).await;
+
+ assert!(app.state().is_updating);
+ assert_eq!(app.state().update_target_exe, std::env::current_exe().ok());
+}
+
+#[test]
+fn test_restart_resolution_recovers_unlinked_path() {
+ let temp = tempfile::tempdir().unwrap();
+ let current_bin = temp.path().join("moviebox-tui");
+ std::fs::write(&current_bin, b"new binary").unwrap();
+
+ let deleted_link = temp.path().join("moviebox-tui.old (deleted)");
+ let resolved = moviebox_tui::updater::resolve_executable_path(&deleted_link);
+ assert_eq!(resolved, current_bin);
+}