Add '--top' flag to 'inc' subcommand

ClementNerma · May 10, 2022 · 9961491 · 9961491
1 parent 9c4ef78
commit 9961491
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/src/cmd.rs b/src/cmd.rs
@@ -58,6 +58,9 @@ pub struct Add {
 pub struct Inc {
     #[clap()]
     pub path: String,
+
+    #[clap(long, help = "Give the maximum score to this directory")]
+    pub top: bool,
 }
 
 #[derive(Args)]

diff --git a/src/index.rs b/src/index.rs
@@ -16,7 +16,12 @@ impl Index {
         }
     }
 
-    pub fn add_or_inc(&mut self, path: String, inc_if_exists: bool) -> Result<(), String> {
+    pub fn add_or_inc(
+        &mut self,
+        path: String,
+        update_score: impl FnOnce(u64) -> u64,
+        default_value: u64,
+    ) -> Result<(), String> {
         if path.is_empty() {
             return Err("Please provide a valid path.".to_string());
         }
@@ -33,24 +38,26 @@ impl Index {
 
         match self.scored_entries.entry(path) {
             Entry::Occupied(mut entry) => {
-                if inc_if_exists {
-                    *entry.get_mut() += 1;
-                }
+                *entry.get_mut() = update_score(*entry.get());
             }
             Entry::Vacant(entry) => {
-                entry.insert(1);
+                entry.insert(default_value);
             }
         }
 
         Ok(())
     }
 
     pub fn add(&mut self, path: String) -> Result<(), String> {
-        self.add_or_inc(path, false)
+        self.add_or_inc(path, |score| score, 1)
     }
 
-    pub fn inc(&mut self, path: String) -> Result<(), String> {
-        self.add_or_inc(path, true)
+    pub fn inc(&mut self, path: String, set_top: bool) -> Result<(), String> {
+        self.add_or_inc(
+            path,
+            |score| score.saturating_add(1),
+            if set_top { u64::MAX } else { 1 },
+        )
     }
 
     pub fn query_all(&self, query: &str, after: Option<&str>) -> Vec<IndexEntry> {

diff --git a/src/main.rs b/src/main.rs
@@ -47,9 +47,9 @@ fn main() {
                 .unwrap_or_else(|e| fail(&format!("Failed to add directory: {e}")));
         }
 
-        Action::Inc(Inc { path }) => {
+        Action::Inc(Inc { path, top }) => {
             index
-                .inc(path)
+                .inc(path, top)
                 .unwrap_or_else(|e| fail(&format!("Failed to increment directory: {e}")));
         }