fix oci download progress

Author: QaidVoid

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "soar-dl"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["Rabindra Dhakal <[email protected]>"]
 description = "A fast download manager"
 license = "MIT"

Cargo.toml

@@ -1,12 +1,15 @@
 # soar-dl
-A lightning-fast, feature-rich release asset downloader for GitHub and GitLab repositories with support for direct downloads.
+
+A lightning-fast, feature-rich release download manager with support for GitHub, GitLab and OCI package downloads
 
 # Installation
+
 ```sh
 cargo install soar-dl -F binary
 ```
 
 # Usage
+
 ## Examples
 
 > [!note]
@@ -22,6 +25,11 @@ soar-dl --gitlab "inkscape/inkscape"
 # Download using gitlab project id
 soar-dl --github "18817634"
 
+# Download ghcr image or blob
+# Note: when using ghcr image, the custom path is always treated as a directory
+soar-dl --ghcr "ghcr.io/pkgforge/pkgcache/86box/appimage/official/stable/86box:v4.2.1-x86_64-linux"
+soar-dl --ghcr "ghcr.io/pkgforge/pkgcache/86box/appimage/official/stable/86box@sha256:28e166a2253f058bfe380bd856cd056b3ca9d8544fc82193f017bb7fdc39b749"
+
 # Direct download
 soar-dl "https://github.com/pkgforge/soar/releases/download/nightly/soar-nightly-x86_64-linux"
 
@@ -38,6 +46,7 @@ soar-dl --github "pkgforge/soar" --gitlab "18817634" --output "final"
 ```
 
 ## Command Line Options
+
 ```
 Usage: soar-dl [OPTIONS] [LINKS]...
 
@@ -47,6 +56,7 @@ Arguments:
 Options:
       --github <GITHUB>             Github project
       --gitlab <GITLAB>             Gitlab project
+      --ghcr <GHCR>                 GHCR image or blob
   -r, --regex <REGEX_PATTERNS>      Regex to select the asset. Only works for github downloads
   -m, --match <MATCH_KEYWORDS>      Check if the asset contains given string
   -e, --exclude <EXCLUDE_KEYWORDS>  Check if the asset contains given string

README.md

@@ -21,7 +21,7 @@ pub struct Args {
     #[arg(required = false, long)]
     pub gitlab: Vec<String>,
 
-    /// OCI reference
+    /// GHCR image or blob
     #[arg(required = false, long)]
     pub ghcr: Vec<String>,
 

src/bin/soar-dl/cli.rs

@@ -157,7 +157,7 @@ impl Downloader {
                         callback(DownloadState::Preparing(total_bytes));
                     }
                     let mut current = downloaded_bytes.lock().unwrap();
-                    *current = bytes;
+                    *current += bytes;
                     callback(DownloadState::Progress(*current));
                 }
             })
@@ -211,7 +211,7 @@ impl Downloader {
                     .pull_layer(&layer, &file_path, move |bytes, _| {
                         if let Some(ref callback) = cb_clone {
                             let mut current = downloaded_bytes.lock().unwrap();
-                            *current = bytes;
+                            *current += bytes;
                             callback(DownloadState::Progress(*current));
                         }
                     })