Smoother progress updates for installation

Author: nab138

Cargo.lock

@@ -3,7 +3,7 @@ name = "isideload"
 description = "Sideload iOS/iPadOS applications"
 license = "MIT"
 authors = ["Nicholas Sharp <nab@nabdev.me>"]
-version = "0.3.8"
+version = "0.3.9"
 edition = "2024"
 repository = "https://github.com/nab138/isideload"
 documentation = "https://docs.rs/isideload"

isideload/Cargo.toml

@@ -18,7 +18,7 @@ use std::{future::Future, path::Path};
 pub async fn install_app(
     provider: &impl IdeviceProvider,
     app_path: &Path,
-    progress_callback: impl Fn(u64),
+    progress_callback: impl Fn(u64) + Send + Sync,
 ) -> Result<(), Report> {
     let mut afc_client = AfcClient::connect(provider)
         .await
@@ -28,7 +28,20 @@ pub async fn install_app(
         "PublicStaging/{}",
         app_path.file_name().ok_or_report()?.to_string_lossy()
     );
-    afc_upload_dir(&mut afc_client, app_path, &dir).await?;
+    let total_size = get_dir_size(app_path).unwrap_or(1) as f64;
+    let mut uploaded = 0;
+    let cb = |progress: f64| {
+        progress_callback((progress * 70.0) as u64);
+    };
+    afc_upload_dir(
+        &mut afc_client,
+        app_path,
+        &dir,
+        &cb,
+        &mut uploaded,
+        total_size,
+    )
+    .await?;
 
     let mut instproxy_client = InstallationProxyClient::connect(provider)
         .await
@@ -43,7 +56,7 @@ pub async fn install_app(
             dir,
             Some(plist::Value::Dictionary(options)),
             async |(percentage, _)| {
-                progress_callback(percentage);
+                progress_callback((70.0 + 0.3 * percentage as f64) as u64);
             },
             (),
         )
@@ -59,7 +72,7 @@ pub async fn install_app_rsd(
     provider: &mut impl RsdProvider,
     handshake: &mut RsdHandshake,
     app_path: &Path,
-    progress_callback: impl Fn(u64),
+    progress_callback: impl Fn(u64) + Send + Sync,
 ) -> Result<(), Report> {
     let mut afc_client = AfcClient::connect_rsd(provider, handshake)
         .await
@@ -69,7 +82,20 @@ pub async fn install_app_rsd(
         "PublicStaging/{}",
         app_path.file_name().ok_or_report()?.to_string_lossy()
     );
-    afc_upload_dir(&mut afc_client, app_path, &dir).await?;
+    let total_size = get_dir_size(app_path).unwrap_or(1) as f64;
+    let mut uploaded = 0;
+    let cb = |pct: f64| {
+        progress_callback((pct * 70.0) as u64);
+    };
+    afc_upload_dir(
+        &mut afc_client,
+        app_path,
+        &dir,
+        &cb,
+        &mut uploaded,
+        total_size,
+    )
+    .await?;
 
     let mut instproxy_client = InstallationProxyClient::connect_rsd(provider, handshake)
         .await
@@ -84,7 +110,7 @@ pub async fn install_app_rsd(
             dir,
             Some(plist::Value::Dictionary(options)),
             async |(percentage, _)| {
-                progress_callback(percentage);
+                progress_callback((70.0 + 0.3 * percentage as f64) as u64);
             },
             (),
         )
@@ -94,10 +120,28 @@ pub async fn install_app_rsd(
     Ok(())
 }
 
+fn get_dir_size(path: &Path) -> Result<u64, Report> {
+    let mut size = 0;
+    for entry in isideload_vfs::fs::read_dir(path)? {
+        let entry = entry?;
+        let path = entry.path();
+        let meta = isideload_vfs::fs::metadata(&path)?;
+        if meta.is_dir() {
+            size += get_dir_size(&path)?;
+        } else {
+            size += meta.len();
+        }
+    }
+    Ok(size)
+}
+
 fn afc_upload_dir<'a>(
     afc_client: &'a mut AfcClient,
     path: &'a Path,
     afc_path: &'a str,
+    cb: &'a (dyn Fn(f64) + Send + Sync),
+    uploaded: &'a mut u64,
+    total: f64,
 ) -> Pin<Box<dyn Future<Output = Result<(), Report>> + Send + 'a>> {
     Box::pin(async move {
         let entries = isideload_vfs::fs::read_dir(path)?;
@@ -115,7 +159,7 @@ fn afc_upload_dir<'a>(
                     afc_path,
                     path.file_name().ok_or_report()?.to_string_lossy()
                 );
-                afc_upload_dir(afc_client, &path, &new_afc_path).await?;
+                afc_upload_dir(afc_client, &path, &new_afc_path, cb, uploaded, total).await?;
             } else {
                 let mut file_handle = afc_client
                     .open(
@@ -135,6 +179,8 @@ fn afc_upload_dir<'a>(
                         .write_entire(chunk)
                         .await
                         .map_err(Error::IdeviceError)?;
+                    *uploaded += chunk.len() as u64;
+                    cb(*uploaded as f64 / total);
                 }
                 file_handle.close().await.map_err(Error::IdeviceError)?;
             }