feat: add progress display during updates

Author: QaidVoid

Cargo.lock

@@ -20,7 +20,7 @@ shellexpand = "3.1.2"
 thiserror = "2.0.18"
 toml = "1.0.7"
 ureq = "3.3.0"
-zsync-rs = "0.1.0"
+zsync-rs = "0.1.1"
 
 [profile.release]
 opt-level = "z"

Cargo.toml

@@ -3,6 +3,7 @@ pub mod config;
 pub mod error;
 pub mod update_info;
 pub mod updater;
+pub mod util;
 
 pub use error::Error;
 pub use updater::{UpdateStats, Updater};

src/lib.rs

@@ -3,6 +3,7 @@ use std::fs;
 use std::path::PathBuf;
 
 use appimageupdate::config;
+use appimageupdate::util::format_size;
 use appimageupdate::{Error, Updater};
 use clap::Parser;
 
@@ -51,22 +52,6 @@ fn main() {
     }
 }
 
-fn format_size(bytes: u64) -> String {
-    const KB: u64 = 1024;
-    const MB: u64 = 1024 * KB;
-    const GB: u64 = 1024 * MB;
-
-    if bytes >= GB {
-        format!("{:.1} GB", bytes as f64 / GB as f64)
-    } else if bytes >= MB {
-        format!("{:.1} MB", bytes as f64 / MB as f64)
-    } else if bytes >= KB {
-        format!("{:.1} KB", bytes as f64 / KB as f64)
-    } else {
-        format!("{} B", bytes)
-    }
-}
-
 fn run(cli: Cli) -> Result<(), Error> {
     if !cli.github_api_proxy.is_empty() {
         config::set_proxies(cli.github_api_proxy.clone());

src/main.rs

@@ -6,6 +6,7 @@ use zsync_rs::{ControlFile, ZsyncAssembly};
 use crate::appimage::AppImage;
 use crate::error::{Error, Result};
 use crate::update_info::UpdateInfo;
+use crate::util::format_size;
 
 struct UpdateContext {
     source_size: u64,
@@ -238,10 +239,20 @@ impl Updater {
         zsync_url: &str,
         ctx: &UpdateContext,
     ) -> Result<UpdateStats> {
-        let assembly = ZsyncAssembly::from_url(zsync_url, output_path)
+        let mut assembly = ZsyncAssembly::from_url(zsync_url, output_path)
             .map_err(|e| Error::Zsync(format!("Failed to initialize zsync: {}", e)))?;
 
-        let mut assembly = assembly;
+        assembly.set_progress_callback(|done, total| {
+            let percent = total.checked_div(100).map(|p| done / p).unwrap_or(0);
+            print!(
+                "\rProgress: {:3}% ({}/{})",
+                percent,
+                format_size(done),
+                format_size(total)
+            );
+            use std::io::Write;
+            std::io::stdout().flush().ok();
+        });
 
         let blocks_reused = assembly
             .submit_source_file(source_path)
@@ -256,6 +267,8 @@ impl Updater {
             .download_missing_blocks()
             .map_err(|e| Error::Zsync(format!("Failed to download blocks: {}", e)))?;
 
+        println!();
+
         assembly
             .complete()
             .map_err(|e| Error::Zsync(format!("Failed to complete assembly: {}", e)))?;

src/updater.rs

@@ -0,0 +1,18 @@
+pub fn format_size(bytes: u64) -> String {
+    const KB: u64 = 1024;
+    const MB: u64 = 1024 * KB;
+    const GB: u64 = 1024 * MB;
+    const TB: u64 = 1024 * GB;
+
+    if bytes >= TB {
+        format!("{:.1} TB", bytes as f64 / TB as f64)
+    } else if bytes >= GB {
+        format!("{:.1} GB", bytes as f64 / GB as f64)
+    } else if bytes >= MB {
+        format!("{:.1} MB", bytes as f64 / MB as f64)
+    } else if bytes >= KB {
+        format!("{:.1} KB", bytes as f64 / KB as f64)
+    } else {
+        format!("{} B", bytes)
+    }
+}