allow specifying extract directory; fix extract when output is not specified

Author: QaidVoid

README.md

@@ -45,11 +45,11 @@ soar-dl --github "pkgforge/soar" --gitlab "18817634" --output "final/"
 soar-dl --github "pkgforge/soar" --gitlab "18817634" --output "final"
 
 # Extract archives automatically (only `tar.gz`, `tar.xz`, `tar.zstd`, `tar.bz2`, and `zip` are supported)
-soar-dl "https://github.com/pkgforge/soar/releases/download/v0.5.14/soar-x86_64-linux.tar.gz" --extract
+soar-dl "https://github.com/pkgforge/soar/releases/download/v0.5.14/soar-x86_64-linux.tar.gz" --extract --extract-dir extracted
 
 # Stream response to stdout
 # If you like to pipe the response to other commands, also use quiet mode `-q` to silence other outputs
-soar-dl "https://github.com/pkgforge/soar/releases/download/v0.5.14/soar-x86_64-linux.tar.gz" -O-
+soar-dl "https://github.com/pkgforge/soar/releases/download/v0.5.14/soar-x86_64-linux.tar.gz" -o-
 ```
 
 ## Command Line Options

src/bin/soar-dl/cli.rs

@@ -65,6 +65,10 @@ pub struct Args {
     #[arg(required = false, long)]
     pub extract: bool,
 
+    /// Directory where to extract the archive
+    #[arg(required = false, long)]
+    pub extract_dir: Option<String>,
+
     /// Quiet mode
     #[arg(required = false, long, short)]
     pub quiet: bool,

src/bin/soar-dl/download_manager.rs

@@ -63,6 +63,7 @@ impl DownloadManager {
             exclude_keywords: self.args.exclude_keywords.clone().unwrap_or_default(),
             exact_case: false,
             extract_archive: self.args.extract,
+            extract_dir: self.args.extract_dir.clone(),
         }
     }
 
@@ -192,6 +193,7 @@ impl DownloadManager {
                         output_path: self.args.output.clone(),
                         progress_callback: Some(self.progress_callback.clone()),
                         extract_archive: self.args.extract,
+                        extract_dir: self.args.extract_dir.clone(),
                     };
                     let _ = downloader
                         .download(options)

src/downloader.rs

@@ -22,7 +22,9 @@ use crate::{
     archive,
     error::DownloadError,
     oci::{OciClient, OciLayer, OciManifest, Reference},
-    utils::{extract_filename, extract_filename_from_url, is_elf, matches_pattern},
+    utils::{
+        build_absolute_path, extract_filename, extract_filename_from_url, is_elf, matches_pattern,
+    },
 };
 
 #[derive(Debug, Clone)]
@@ -40,6 +42,7 @@ pub struct DownloadOptions {
     pub output_path: Option<String>,
     pub progress_callback: Option<Arc<dyn Fn(DownloadState) + Send + Sync + 'static>>,
     pub extract_archive: bool,
+    pub extract_dir: Option<String>,
 }
 
 #[derive(Default)]
@@ -165,8 +168,22 @@ impl Downloader {
         }
 
         if options.extract_archive {
-            let extract_dir = output_path.parent().unwrap_or_else(|| Path::new("."));
-            archive::extract_archive(output_path, extract_dir).await?;
+            let extract_dir = match &options.extract_dir {
+                Some(path) => {
+                    let path = Path::new(path);
+                    if !path.is_dir() {
+                        fs::create_dir_all(path).await?;
+                    }
+                    path.to_path_buf()
+                }
+                None => {
+                    let path = build_absolute_path(output_path)?;
+                    path.parent()
+                        .map(|p| p.to_path_buf())
+                        .unwrap_or_else(|| PathBuf::from("."))
+                }
+            };
+            archive::extract_archive(output_path, &extract_dir).await?;
         }
 
         Ok(filename)

src/platform.rs

@@ -125,6 +125,7 @@ pub struct PlatformDownloadOptions {
     pub exclude_keywords: Vec<String>,
     pub exact_case: bool,
     pub extract_archive: bool,
+    pub extract_dir: Option<String>,
 }
 
 #[derive(Default)]
@@ -287,6 +288,7 @@ impl<P: ReleasePlatform> ReleaseHandler<P> {
                 output_path: options.output_path,
                 progress_callback: options.progress_callback,
                 extract_archive: options.extract_archive,
+                extract_dir: options.extract_dir,
             })
             .await?)
     }

src/utils.rs

@@ -1,4 +1,7 @@
-use std::path::Path;
+use std::{
+    env,
+    path::{Path, PathBuf},
+};
 
 use regex::Regex;
 use reqwest::StatusCode;
@@ -92,6 +95,7 @@ pub fn matches_pattern(
         })
 }
 
+// https://users.rust-lang.org/t/encode-decode-uri/90017/16
 pub fn decode_uri(s: impl AsRef<str>) -> String {
     let re = Regex::new(r"(%[A-Fa-f0-9]{2})+").unwrap();
 
@@ -111,3 +115,12 @@ pub fn decode_uri(s: impl AsRef<str>) -> String {
     })
     .into_owned()
 }
+
+pub fn build_absolute_path<P: AsRef<Path>>(path: P) -> std::io::Result<PathBuf> {
+    let path = path.as_ref();
+    if path.is_absolute() {
+        Ok(path.to_path_buf())
+    } else {
+        Ok(env::current_dir()?.join(path))
+    }
+}