added history filtering

Author: shaneish

src/args.rs

@@ -73,10 +73,10 @@ impl Cmd {
                     Some(name) => Cmd::Remove(Rabbit::RequestName(name)),
                     None => Cmd::Remove(Rabbit::RequestPath(current_dir.to_path_buf())),
                 },
-                "ls" | "list" => Cmd::Passthrough("show_ls".to_string()),
-                "show_ls" => Cmd::ListHops,
-                "version" | "v" => Cmd::Passthrough("show_version".to_string()),
-                "show_version" => Cmd::PrintMsg(format!(
+                "ls" | "list" => Cmd::Passthrough("_ls".to_string()),
+                "_ls" => Cmd::ListHops,
+                "version" | "v" => Cmd::Passthrough("_version".to_string()),
+                "_version" => Cmd::PrintMsg(format!(
                     "{} 🐇 {}{}",
                     "bunnyhop".cyan().bold(),
                     "v.".bold(),
@@ -86,8 +86,8 @@ impl Cmd {
                     Cmd::SetBrb(env::current_dir().expect("[error] Unable to add brb location."))
                 }
                 "back" => Cmd::BrbHop,
-                "help" => Cmd::Passthrough("show_help".to_string()),
-                "show_help" => Cmd::PrintHelp,
+                "help" => Cmd::Passthrough("_help".to_string()),
+                "_help" => Cmd::PrintHelp,
                 whatevs => Cmd::Use(Rabbit::RequestName(whatevs.to_string())),
             },
             None => Cmd::PrintMsg("[error] Unable to parse current arguments.".to_string()),

src/lib.rs

@@ -27,7 +27,7 @@ pub struct Config {
 #[derive(Deserialize, PartialEq, Debug)]
 pub struct Settings {
     pub default_editor: String,
-    pub max_history_entries: usize,
+    pub max_history: usize,
     pub ls_display_block: usize,
 }
 
@@ -100,7 +100,7 @@ impl Hopper {
             let mut new_conf =
                 fs::File::create(&env.config_file).expect("[error] Unable to create config file.");
             new_conf
-                .write_all(b"[settings]\ndefault_editor=\"nvim\"\nmax_history_entries=200\nls_display_block=0")
+                .write_all(b"[settings]\ndefault_editor=\"nvim\"\nmax_history=0\nls_display_block=0")
                 .expect("[error] Unable to generate default config file.");
         };
         let toml_str: String = fs::read_to_string(env.config_file.clone()).unwrap();
@@ -163,6 +163,25 @@ impl Hopper {
         Ok(())
     }
 
+    fn map_editor<T: AsRef<Path>>(&self, f: T) -> String {
+        let ext_option = f.as_ref().extension();
+        match &self.config.editors {
+            Some(editor_map) => match ext_option {
+                Some(ext) => match editor_map.get(
+                    &(ext
+                        .to_str()
+                        .expect("[error] Cannot extract extension.")
+                        .to_string()),
+                ) {
+                    Some(special_editor) => special_editor.to_string(),
+                    None => self.config.settings.default_editor.to_string(),
+                },
+                None => self.config.settings.default_editor.to_string(),
+            },
+            None => self.config.settings.default_editor.to_string(),
+        }
+    }
+
     pub fn use_hop(&mut self, shortcut_name: String) -> anyhow::Result<()> {
         let query = format!(
             "SELECT location FROM named_hops WHERE name=\"{}\"",
@@ -173,9 +192,10 @@ impl Hopper {
             let location = statement.read::<String, _>("location")?;
             let location_path = PathBuf::from(&location);
             if location_path.is_file() {
+                let editor = self.map_editor(&location_path);
                 println!(
                     "__cmd__ {} {}",
-                    self.config.settings.default_editor, location
+                    editor, location
                 );
             } else {
                 println!("__cd__ {}", location);
@@ -187,22 +207,7 @@ impl Hopper {
             Some((dir, short)) => {
                 self.log_history(dir.as_path().display().to_string(), short)?;
                 if dir.is_file() {
-                    let ext_option = dir.extension();
-                    let editor = match &self.config.editors {
-                        Some(editor_map) => match ext_option {
-                            Some(ext) => match editor_map.get(
-                                &(ext
-                                    .to_str()
-                                    .expect("[error] Cannot extract extension.")
-                                    .to_string()),
-                            ) {
-                                Some(special_editor) => special_editor,
-                                None => &self.config.settings.default_editor,
-                            },
-                            None => &self.config.settings.default_editor,
-                        },
-                        None => &self.config.settings.default_editor,
-                    };
+                    let editor = self.map_editor(&dir);
                     println!("__cmd__ {} {}", editor, dir.as_path().display().to_string());
                 } else {
                     println!("__cd__ {}", dir.as_path().display().to_string());
@@ -226,13 +231,23 @@ impl Hopper {
     }
 
     pub fn log_history(&self, location: String, name: String) -> anyhow::Result<()> {
-        let query = format!(
-            "INSERT INTO history (time, name, location) VALUES ({}, \"{}\", \"{}\") ",
-            Local::now().format("%Y%m%d%H%M%S"),
-            name,
-            location
-        );
-        self.db.execute(&query)?;
+        if self.config.settings.max_history > 0 {
+            let query = format!(
+                "INSERT INTO history (time, name, location) VALUES ({}, \"{}\", \"{}\") ",
+                Local::now().format("%Y%m%d%H%M%S"),
+                name,
+                location
+            );
+            self.db.execute(&query)?;
+            let mut count_result = self.db.prepare("SELECT COUNT(*) AS hist_count, MIN(time) AS hist_min FROM history")?;
+            if let Ok(sqlite::State::Row) = count_result.next() {
+                let history_count = count_result.read::<i64, _>("hist_count")?;
+                let history_min = count_result.read::<String, _>("hist_min")?;
+                if history_count > self.config.settings.max_history as i64 {
+                    self.db.execute(&format!("DELETE FROM history WHERE time=\"{}\"", history_min))?;
+                };
+            };
+        };
         Ok(())
     }
 

tests/test_hopper.rs

@@ -46,7 +46,7 @@ fn test_read_default_configs() {
     let default_config = bunnyhop::Config {
         settings: Settings {
             default_editor: "nvim".to_string(),
-            max_history_entries: 200,
+            max_history: 0,
             ls_display_block: 0,
         },
         editors: None,
@@ -65,7 +65,7 @@ fn test_read_configs_with_alt_editors() {
     alt_toml.push("hop.toml");
     let mut alt_toml_file =
         fs::File::create(&alt_toml).expect("Unable to create alternate hop.toml.");
-    alt_toml_file.write_all(b"[settings]\ndefault_editor=\"vi\"\nmax_history_entries=100\nls_display_block=10\n[editors]\npy=\"nano\"\nipynb=\"code\"\nrust=\"nvim\"").expect("Unable to generate alternate hop.toml.");
+    alt_toml_file.write_all(b"[settings]\ndefault_editor=\"vi\"\nmax_history=100\nls_display_block=10\n[editors]\npy=\"nano\"\nipynb=\"code\"\nrust=\"nvim\"").expect("Unable to generate alternate hop.toml.");
     let hopper = get_test_hopper(&config_dir);
     let expected_editors = HashMap::from_iter(
         [("py", "nano"), ("ipynb", "code"), ("rust", "nvim")]
@@ -75,7 +75,7 @@ fn test_read_configs_with_alt_editors() {
     let default_config = bunnyhop::Config {
         settings: Settings {
             default_editor: "vi".to_string(),
-            max_history_entries: 100,
+            max_history: 100,
             ls_display_block: 10,
         },
         editors: Some(expected_editors),