examples: Don't rely on progress info from dfu-nusb

Let indicatif wrap the AsyncReader to get progress information as opposed to using the callback from dfu-nusb
dfu-rs · Oct 31, 2024 · 1792eb4 · 1792eb4
1 parent 58217fb
commit 1792eb4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,7 +11,7 @@ readme = "README.md"
 [dependencies]
 dfu-core = { version = "0.6.0", features = ["async"] }
 futures = { version = "0.3.31", features = ["io-compat"] }
-indicatif = "0.17.8"
+indicatif = { version = "0.17.8", features = [ "tokio" ] }
 nusb = "0.1.10"
 thiserror = "1.0.65"
 tokio = { version = "1.41.0", features = ["full"] }

diff --git a/examples/download.rs b/examples/download.rs
@@ -102,20 +102,11 @@ pub async fn run(opts: Cli) -> anyhow::Result<()> {
             .progress_chars("#>-"),
     );
 
-    device.with_progress({
-        let bar = bar.clone();
-        move |count| {
-            bar.inc(count as u64);
-            if bar.position() == file_size as u64 {
-                bar.finish();
-            }
-        }
-    });
-
     if let Some(address) = override_address {
         device.override_address(address);
     }
 
+    let file = bar.wrap_async_read(file);
     let file = file.compat();
     match device.download(file, file_size).await {
         Ok(_) => (),