add glob support

Author: QaidVoid

Cargo.lock

@@ -21,6 +21,7 @@ binary = ["clap", "indicatif"]
 [dependencies]
 bzip2 = "0.5.2"
 clap = { version = "4.5.35", features = ["cargo", "derive"], optional = true }
+fast-glob = "0.4.5"
 flate2 = "1.1.1"
 futures = "0.3.31"
 indicatif = { version = "0.17.11", optional = true }

Cargo.toml

@@ -31,7 +31,11 @@ pub struct Args {
 
     /// Regex to select the asset.
     #[arg(required = false, short = 'r', long = "regex")]
-    pub regex_patterns: Option<Vec<String>>,
+    pub regexes: Option<Vec<String>>,
+
+    /// Glob to select the asset.
+    #[arg(required = false, short = 'g', long = "glob")]
+    pub globs: Option<Vec<String>>,
 
     /// Check if the asset contains given string
     #[arg(required = false, short, long = "match")]

src/bin/soar-dl/cli.rs

@@ -37,9 +37,9 @@ impl DownloadManager {
         let _ = self.handle_direct_downloads().await;
     }
 
-    fn create_regex(&self) -> Vec<Regex> {
+    fn create_regexes(&self) -> Vec<Regex> {
         self.args
-            .regex_patterns
+            .regexes
             .clone()
             .map(|patterns| {
                 patterns
@@ -53,12 +53,13 @@ impl DownloadManager {
     }
 
     fn create_platform_options(&self, tag: Option<String>) -> PlatformDownloadOptions {
-        let asset_regexes = self.create_regex();
+        let regexes = self.create_regexes();
         PlatformDownloadOptions {
             output_path: self.args.output.clone(),
             progress_callback: Some(self.progress_callback.clone()),
             tag,
-            regex_patterns: asset_regexes,
+            regexes,
+            globs: self.args.globs.clone().unwrap_or_default(),
             match_keywords: self.args.match_keywords.clone().unwrap_or_default(),
             exclude_keywords: self.args.exclude_keywords.clone().unwrap_or_default(),
             exact_case: false,
@@ -129,14 +130,15 @@ impl DownloadManager {
     }
 
     async fn handle_oci_download(&self, reference: &str) -> Result<(), PlatformError> {
-        let regex_patterns = self.create_regex();
+        let regexes = self.create_regexes();
         let options = OciDownloadOptions {
             url: reference.to_string(),
             concurrency: self.args.concurrency.clone(),
             output_path: self.args.output.clone(),
             progress_callback: Some(self.progress_callback.clone()),
             api: self.args.ghcr_api.clone(),
-            regex_patterns,
+            regexes,
+            globs: self.args.globs.clone().unwrap_or_default(),
             match_keywords: self.args.match_keywords.clone().unwrap_or_default(),
             exclude_keywords: self.args.exclude_keywords.clone().unwrap_or_default(),
             exact_case: self.args.exact_case,

src/bin/soar-dl/download_manager.rs

@@ -57,7 +57,8 @@ pub struct OciDownloadOptions {
     pub output_path: Option<String>,
     pub progress_callback: Option<Arc<dyn Fn(DownloadState) + Send + Sync + 'static>>,
     pub api: Option<String>,
-    pub regex_patterns: Vec<Regex>,
+    pub regexes: Vec<Regex>,
+    pub globs: Vec<String>,
     pub match_keywords: Vec<String>,
     pub exclude_keywords: Vec<String>,
     pub exact_case: bool,
@@ -289,7 +290,8 @@ impl OciDownloader {
 
                 matches_pattern(
                     &title,
-                    options.regex_patterns.as_slice(),
+                    options.regexes.as_slice(),
+                    options.globs.as_slice(),
                     options.match_keywords.as_slice(),
                     options.exclude_keywords.as_slice(),
                     options.exact_case,

src/downloader.rs

@@ -120,7 +120,8 @@ pub struct PlatformDownloadOptions {
     pub output_path: Option<String>,
     pub progress_callback: Option<Arc<dyn Fn(DownloadState) + Send + Sync + 'static>>,
     pub tag: Option<String>,
-    pub regex_patterns: Vec<Regex>,
+    pub regexes: Vec<Regex>,
+    pub globs: Vec<String>,
     pub match_keywords: Vec<String>,
     pub exclude_keywords: Vec<String>,
     pub exact_case: bool,
@@ -254,7 +255,8 @@ impl<P: ReleasePlatform> ReleaseHandler<'_, P> {
                 let name = asset.name();
                 matches_pattern(
                     name,
-                    options.regex_patterns.as_slice(),
+                    options.regexes.as_slice(),
+                    options.globs.as_slice(),
                     options.match_keywords.as_slice(),
                     options.exclude_keywords.as_slice(),
                     options.exact_case,

src/platform.rs

@@ -3,6 +3,7 @@ use std::{
     path::{Path, PathBuf},
 };
 
+use fast_glob::glob_match;
 use regex::Regex;
 use reqwest::StatusCode;
 use tokio::{
@@ -59,12 +60,14 @@ pub fn should_fallback(status: StatusCode) -> bool {
 
 pub fn matches_pattern(
     name: &str,
-    regex_patterns: &[Regex],
+    regexes: &[Regex],
+    globs: &[String],
     match_keywords: &[String],
     exclude_keywords: &[String],
     exact_case: bool,
 ) -> bool {
-    regex_patterns.iter().all(|regex| regex.is_match(name))
+    regexes.iter().all(|regex| regex.is_match(name))
+        && globs.iter().all(|glob| glob_match(glob, name))
         && match_keywords.iter().all(|keyword| {
             keyword
                 .split(',')