feat(download): support comma-separated keywords in filters

pkgforge · Nov 17, 2024 · 38a4eb1 · 38a4eb1
1 parent 7b6c490
commit 38a4eb1
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/src/misc/download.rs b/src/misc/download.rs
@@ -269,12 +269,30 @@ pub async fn download_and_save(
                                 .all(|regex| regex.is_match(&asset.name))
                                 && match_keywords.map_or(true, |keywords| {
                                     keywords.iter().all(|keyword| {
-                                        asset.name.to_lowercase().contains(&keyword.to_lowercase())
+                                        keyword
+                                            .split(',')
+                                            .map(str::trim)
+                                            .filter(|s| !s.is_empty())
+                                            .all(|part| {
+                                                asset
+                                                    .name
+                                                    .to_lowercase()
+                                                    .contains(&part.to_lowercase())
+                                            })
                                     })
                                 })
                                 && exclude_keywords.map_or(true, |keywords| {
                                     keywords.iter().all(|keyword| {
-                                        !asset.name.to_lowercase().contains(&keyword.to_lowercase())
+                                        keyword
+                                            .split(',')
+                                            .map(str::trim)
+                                            .filter(|s| !s.is_empty())
+                                            .all(|part| {
+                                                !asset
+                                                    .name
+                                                    .to_lowercase()
+                                                    .contains(&part.to_lowercase())
+                                            })
                                     })
                                 })
                         })

diff --git a/src/registry/storage.rs b/src/registry/storage.rs
@@ -63,9 +63,7 @@ impl PackageStorage {
             .get_packages(&pkg_query)
             .ok_or_else(|| anyhow::anyhow!("Package {} not found", package_name))?;
 
-        packages.sort_by(|a, b| {
-            a.package.family.cmp(&b.package.family)
-        });
+        packages.sort_by(|a, b| a.package.family.cmp(&b.package.family));
 
         let package = if yes || packages.len() == 1 {
             &packages[0]