SQLite History (third version)

.github/workflows/ci.yml

@@ -27,7 +27,12 @@ jobs:
       - uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --all 
+          args: --workspace 
+
+      - uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --workspace --features sqlite
 
       - uses: actions-rs/cargo@v1
         with:
@@ -38,3 +43,8 @@ jobs:
         with:
           command: clippy
           args: -- -D warnings
+
+      - uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: --features sqlite -- -D warnings

.gitignore

@@ -1,5 +1,6 @@
 target/
 history.txt
+history.sqlite3
 .DS_Store
 target-coverage/
 tarpaulin-report.html

Cargo.toml

@@ -27,6 +27,9 @@ strip-ansi-escapes = "0.1.1"
 strum = "0.24"
 strum_macros = "0.24"
 fd-lock = "3.0.3"
+rusqlite = { version = "0.27.0", optional = true, features = ["bundled"] }
+serde_json = { version = "1.0.79", optional = true }
+gethostname = { version = "0.2.3", optional = true }
 
 [dev-dependencies]
 tempfile = "3.3.0"
@@ -36,3 +39,4 @@ rstest = "0.12.0"
 [features]
 system_clipboard = ["clipboard"]
 bashisms = []
+sqlite = ["rusqlite", "serde_json", "gethostname"]

src/completion/history.rs

@@ -1,6 +1,9 @@
 use std::ops::Deref;
 
-use crate::{menu_functions::parse_selection_char, Completer, History, Span, Suggestion};
+use crate::{
+    history::SearchQuery, menu_functions::parse_selection_char, Completer, History, Span,
+    Suggestion,
+};
 
 const SELECTION_CHAR: char = '!';
 
@@ -15,32 +18,36 @@ unsafe impl<'menu> Send for HistoryCompleter<'menu> {}
 impl<'menu> Completer for HistoryCompleter<'menu> {
     fn complete(&mut self, line: &str, pos: usize) -> Vec<Suggestion> {
         let parsed = parse_selection_char(line, SELECTION_CHAR);
-        let values = self.0.query_entries(parsed.remainder);
+        let values = self
+            .0
+            .search(SearchQuery::all_that_contain_rev(
+                parsed.remainder.to_string(),
+            ))
+            .expect("todo: error handling");
 
         values
             .into_iter()
-            .map(|value| self.create_suggestion(line, pos, value.deref()))
+            .map(|value| self.create_suggestion(line, pos, value.command_line.deref()))
             .collect()
     }
 
-    fn partial_complete(
+    /*TODO: fn partial_complete(
         &mut self,
         line: &str,
         pos: usize,
         start: usize,
         offset: usize,
-    ) -> Vec<Suggestion> {
-        self.0
-            .iter_chronologic()
-            .rev()
-            .skip(start)
-            .take(offset)
-            .map(|value| self.create_suggestion(line, pos, value.deref()))
-            .collect()
-    }
+    ) -> Vec<Suggestion> {*/
 
-    fn total_completions(&mut self, _line: &str, _pos: usize) -> usize {
-        self.0.max_values()
+    fn total_completions(&mut self, line: &str, _pos: usize) -> usize {
+        let parsed = parse_selection_char(line, SELECTION_CHAR);
+        let count = self
+            .0
+            .count(SearchQuery::all_that_contain_rev(
+                parsed.remainder.to_string(),
+            ))
+            .expect("todo: error handling");
+        count as usize
     }
 }
 

src/core_editor/editor.rs

@@ -23,6 +23,9 @@ impl Default for Editor {
 }
 
 impl Editor {
+    pub fn line_buffer_immut(&self) -> &LineBuffer {
+        &self.line_buffer
+    }
     pub fn line_buffer(&mut self) -> &mut LineBuffer {
         &mut self.line_buffer
     }