From 4bbe1f397a157734218c2df8a9e88e3a4a1187ad Mon Sep 17 00:00:00 2001
From: Rabindra Dhakal <contact@qaidvoid.dev>
Date: Fri, 8 Nov 2024 19:55:47 +0545
Subject: [PATCH] refactor(search): add description search and limit

---
 src/cli.rs              |  6 +++++-
 src/core/config.rs      |  4 ++++
 src/lib.rs              |  3 ++-
 src/package/appimage.rs |  4 ++--
 src/package/mod.rs      | 16 ++++++++++++++--
 src/registry/mod.rs     | 24 ++++++++++++++++++++----
 src/registry/storage.rs | 10 ++++++----
 7 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/src/cli.rs b/src/cli.rs
index d4fb5ec..d327890 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -61,8 +61,12 @@ pub enum Commands {
         query: String,
 
         /// Case sensitive search
-        #[arg(required = false, long)]
+        #[arg(required = false, long, alias = "exact")]
         case_sensitive: bool,
+
+        /// Limit number of result
+        #[arg(required = false, long)]
+        limit: Option<usize>,
     },
 
     /// Query package info
diff --git a/src/core/config.rs b/src/core/config.rs
index cf758ab..6b29700 100644
--- a/src/core/config.rs
+++ b/src/core/config.rs
@@ -22,6 +22,9 @@ pub struct Config {
 
     /// Limit the number of parallel downloads
     pub parallel_limit: Option<u32>,
+
+    /// Limit the number of search results to display
+    pub search_limit: Option<usize>,
 }
 
 /// Struct representing a repository configuration.
@@ -90,6 +93,7 @@ impl Default for Config {
             }],
             parallel: Some(true),
             parallel_limit: Some(4),
+            search_limit: Some(20),
         }
     }
 }
diff --git a/src/lib.rs b/src/lib.rs
index b89f714..e237db2 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -83,8 +83,9 @@ pub async fn init() -> Result<()> {
         Commands::Search {
             query,
             case_sensitive,
+            limit,
         } => {
-            registry.search(&query, case_sensitive).await?;
+            registry.search(&query, case_sensitive, limit).await?;
         }
         Commands::Query { query } => {
             registry.query(&query).await?;
diff --git a/src/package/appimage.rs b/src/package/appimage.rs
index 62b9255..158e8d9 100644
--- a/src/package/appimage.rs
+++ b/src/package/appimage.rs
@@ -36,7 +36,7 @@ const SUPPORTED_DIMENSIONS: &[(u32, u32)] = &[
     (512, 512),
 ];
 
-async fn find_offset(file: &mut BufReader<File>) -> Result<u64> {
+fn find_offset(file: &mut BufReader<File>) -> Result<u64> {
     let mut magic = [0_u8; 4];
     // Little-Endian v4.0
     let kind = Kind::from_target("le_v4_0").unwrap();
@@ -144,7 +144,7 @@ pub async fn integrate_appimage(
     package: &Package,
     file_path: &Path,
 ) -> Result<bool> {
-    let offset = find_offset(file).await?;
+    let offset = find_offset(file)?;
     let squashfs = FilesystemReader::from_reader_with_offset(file, offset)?;
 
     let home_data = home_data_path();
diff --git a/src/package/mod.rs b/src/package/mod.rs
index 25d72da..11cca28 100644
--- a/src/package/mod.rs
+++ b/src/package/mod.rs
@@ -108,6 +108,7 @@ pub struct PackageQuery {
 }
 
 pub fn parse_package_query(query: &str) -> PackageQuery {
+    let query = query.to_lowercase();
     let (base_query, collection) = query
         .rsplit_once('#')
         .map(|(n, r)| (n.to_owned(), (!r.is_empty()).then(|| r.to_lowercase())))
@@ -131,8 +132,19 @@ pub fn ask_package_info(name: &str, path: &Path, size: u64) -> Result<ResolvedPa
         let bin_name = interactive_ask("Binary Name: ", AskType::Normal)?;
         if bin_name.is_empty() {
             eprintln!("Binary name can't be empty.");
-        } else if !bin_name.chars().all(|c| c.is_alphanumeric()) {
-            eprintln!("Binary name must only contain letters and numbers.");
+        } else if !bin_name
+            .chars()
+            .all(|c| c.is_alphanumeric() || c == '-' || c == '_')
+        {
+            eprintln!(
+                "Binary name must only contain letters, numbers, hyphens (-), or underscores (_)."
+            );
+        } else if bin_name.starts_with('-')
+            || bin_name.starts_with('_')
+            || bin_name.ends_with('-')
+            || bin_name.ends_with('_')
+        {
+            eprintln!("Binary name can't start or end with a hyphen (-) or underscore (_).");
         } else {
             break bin_name;
         }
diff --git a/src/registry/mod.rs b/src/registry/mod.rs
index 3b14d0f..609b1a0 100644
--- a/src/registry/mod.rs
+++ b/src/registry/mod.rs
@@ -111,27 +111,43 @@ impl PackageRegistry {
             .await
     }
 
-    pub async fn search(&self, package_name: &str, case_sensitive: bool) -> Result<()> {
+    pub async fn search(
+        &self,
+        package_name: &str,
+        case_sensitive: bool,
+        limit: Option<usize>,
+    ) -> Result<()> {
+        let limit = limit.unwrap_or(CONFIG.search_limit.unwrap_or(20));
         let installed_guard = self.installed_packages.lock().await;
         let result = self.storage.search(package_name, case_sensitive).await;
 
         if result.is_empty() {
             Err(anyhow::anyhow!("No packages found"))
         } else {
-            result.iter().for_each(|pkg| {
+            let displayed_results = result.iter().take(limit).collect::<Vec<_>>();
+            displayed_results.iter().for_each(|pkg| {
                 let installed = if installed_guard.is_installed(pkg) {
                     "+"
                 } else {
                     "-"
                 };
                 println!(
-                    "[{}] [{}] {}: {}",
+                    "[{}] [{}] {}: {} ({})",
                     installed,
                     pkg.collection.clone().color(Color::BrightGreen),
-                    pkg.package.full_name('/').color(Color::Blue),
+                    pkg.package.full_name('/').color(Color::BrightBlue),
                     pkg.package.description,
+                    pkg.package.size.clone().color(Color::BrightMagenta)
                 );
             });
+
+            if result.len() > limit {
+                println!(
+                    "\x1b[5mShowing {} of {} results\x1b[0m",
+                    limit,
+                    result.len()
+                );
+            }
             Ok(())
         }
     }
diff --git a/src/registry/storage.rs b/src/registry/storage.rs
index 222e0c3..2d8153f 100644
--- a/src/registry/storage.rs
+++ b/src/registry/storage.rs
@@ -366,15 +366,17 @@ impl PackageStorage {
                     .flat_map(|(_, packages)| {
                         packages.iter().filter_map(|pkg| {
                             let mut score = 0;
-                            let found_pkg_name = if case_sensitive {
-                                pkg.pkg.clone()
+                            let (found_pkg_name, found_pkg_description) = if case_sensitive {
+                                (pkg.pkg.clone(), pkg.description.clone())
                             } else {
-                                pkg.pkg.to_lowercase()
+                                (pkg.pkg.to_lowercase(), pkg.description.to_lowercase())
                             };
 
                             if found_pkg_name == pkg_name {
-                                score += 2;
+                                score += 5;
                             } else if found_pkg_name.contains(&pkg_name) {
+                                score += 3;
+                            } else if found_pkg_description.contains(&pkg_name) {
                                 score += 1;
                             } else {
                                 return None;