1 files changed, 134 insertions, 39 deletions
diff --git a/src/backend/search.rs b/src/backend/search.rs
index c3b5816..d09dd04 100644
--- a/src/backend/search.rs
+++ b/src/backend/search.rs
@@ -4,50 +4,145 @@ use nucleo_matcher::{
 };
 use std::collections::HashMap;
 
-// Stringify inner Vec<String> by joining/concat
-fn convert_to_string(inner_vec: &Vec<String>) -> String {
-    inner_vec.join(" ")
+#[derive(Debug)]
+pub struct BibiSearch {
+    pub search_string: String, // Search string show in footer, used for search
+    pub inner_search: bool,    // True, if we trigger a search for already filtered list
+    pub filtered_entry_list: Vec<Vec<String>>, // Temporary holds filtered entry list to refilter it
 }
 
-// Return a filtered entry list
-pub fn search_entry_list(search_pattern: &str, orig_list: Vec<Vec<String>>) -> Vec<Vec<String>> {
-    // Create a hashmap to connect stingified entry with entry vec
-    let mut entry_string_hm: HashMap<String, Vec<String>> = HashMap::new();
+impl Default for BibiSearch {
+    fn default() -> Self {
+        Self {
+            search_string: String::new(),
+            inner_search: false,
+            filtered_entry_list: Vec::new(),
+        }
+    }
+}
+
+impl BibiSearch {
+    // Stringify inner Vec<String> by joining/concat
+    fn convert_to_string(inner_vec: &Vec<String>) -> String {
+        inner_vec.join(" ")
+    }
+
+    // Return a filtered entry list
+    pub fn search_entry_list(
+        search_pattern: &str,
+        orig_list: Vec<Vec<String>>,
+    ) -> Vec<Vec<String>> {
+        // Create a hashmap to connect stingified entry with entry vec
+        let mut entry_string_hm: HashMap<String, Vec<String>> = HashMap::new();
+
+        // Convert all entries to string and insert them into the hashmap
+        // next to the original inner Vec<String> of the entry list
+        for entry in orig_list {
+            entry_string_hm.insert(Self::convert_to_string(&entry), entry);
+        }
 
-    // Convert all entries to string and insert them into the hashmap
-    // next to the original inner Vec<String> of the entry list
-    for entry in orig_list {
-        entry_string_hm.insert(convert_to_string(&entry), entry);
+        // Set up matcher (TODO: One time needed only, move to higher level)
+        let mut matcher = Matcher::new(Config::DEFAULT);
+
+        // Filter the stringified entries and collect them into a vec
+        let filtered_matches: Vec<String> = {
+            let matches =
+                Pattern::parse(search_pattern, CaseMatching::Ignore, Normalization::Smart)
+                    .match_list(entry_string_hm.keys(), &mut matcher);
+            matches.into_iter().map(|f| f.0.to_string()).collect()
+        };
+
+        // Create filtered entry list and push the inner entry vec's to it
+        // Use the filtered stringified hm-key as index
+        let mut filtered_list: Vec<Vec<String>> = Vec::new();
+        for m in filtered_matches {
+            filtered_list.push(entry_string_hm[&m].to_owned());
+        }
+        filtered_list
     }
 
-    // Set up matcher (TODO: One time needed only, move to higher level)
-    let mut matcher = Matcher::new(Config::DEFAULT);
-
-    // Filter the stringified entries and collect them into a vec
-    let filtered_matches: Vec<String> = {
-        let matches = Pattern::parse(search_pattern, CaseMatching::Ignore, Normalization::Smart)
-            .match_list(entry_string_hm.keys(), &mut matcher);
-        matches.into_iter().map(|f| f.0.to_string()).collect()
-    };
-
-    // Create filtered entry list and push the inner entry vec's to it
-    // Use the filtered stringified hm-key as index
-    let mut filtered_list: Vec<Vec<String>> = Vec::new();
-    for m in filtered_matches {
-        filtered_list.push(entry_string_hm[&m].to_owned());
+    pub fn search_tag_list(search_pattern: &str, orig_list: Vec<String>) -> Vec<String> {
+        // Set up matcher (TODO: One time needed only)
+        let mut matcher = Matcher::new(Config::DEFAULT);
+
+        // Filter the list items by search pattern
+        let filtered_matches: Vec<String> = {
+            let matches =
+                Pattern::parse(search_pattern, CaseMatching::Ignore, Normalization::Smart)
+                    .match_list(orig_list, &mut matcher);
+            matches.into_iter().map(|f| f.0.to_string()).collect()
+        };
+        filtered_matches
     }
-    filtered_list
-}
 
-pub fn search_tag_list(search_pattern: &str, orig_list: Vec<String>) -> Vec<String> {
-    // Set up matcher (TODO: One time needed only)
-    let mut matcher = Matcher::new(Config::DEFAULT);
-
-    // Filter the list items by search pattern
-    let filtered_matches: Vec<String> = {
-        let matches = Pattern::parse(search_pattern, CaseMatching::Ignore, Normalization::Smart)
-            .match_list(orig_list, &mut matcher);
-        matches.into_iter().map(|f| f.0.to_string()).collect()
-    };
-    filtered_matches
+    pub fn filter_entries_by_tag(keyword: &str, orig_list: &Vec<Vec<String>>) -> Vec<Vec<String>> {
+        let mut filtered_list: Vec<Vec<String>> = Vec::new();
+
+        for e in orig_list {
+            if e[4].contains(keyword) {
+                filtered_list.push(e.to_owned());
+            }
+        }
+
+        filtered_list
+    }
 }
+// // Stringify inner Vec<String> by joining/concat
+// fn convert_to_string(inner_vec: &Vec<String>) -> String {
+//     inner_vec.join(" ")
+// }
+
+// // Return a filtered entry list
+// pub fn search_entry_list(search_pattern: &str, orig_list: Vec<Vec<String>>) -> Vec<Vec<String>> {
+//     // Create a hashmap to connect stingified entry with entry vec
+//     let mut entry_string_hm: HashMap<String, Vec<String>> = HashMap::new();
+
+//     // Convert all entries to string and insert them into the hashmap
+//     // next to the original inner Vec<String> of the entry list
+//     for entry in orig_list {
+//         entry_string_hm.insert(convert_to_string(&entry), entry);
+//     }
+
+//     // Set up matcher (TODO: One time needed only, move to higher level)
+//     let mut matcher = Matcher::new(Config::DEFAULT);
+
+//     // Filter the stringified entries and collect them into a vec
+//     let filtered_matches: Vec<String> = {
+//         let matches = Pattern::parse(search_pattern, CaseMatching::Ignore, Normalization::Smart)
+//             .match_list(entry_string_hm.keys(), &mut matcher);
+//         matches.into_iter().map(|f| f.0.to_string()).collect()
+//     };
+
+//     // Create filtered entry list and push the inner entry vec's to it
+//     // Use the filtered stringified hm-key as index
+//     let mut filtered_list: Vec<Vec<String>> = Vec::new();
+//     for m in filtered_matches {
+//         filtered_list.push(entry_string_hm[&m].to_owned());
+//     }
+//     filtered_list
+// }
+
+// pub fn search_tag_list(search_pattern: &str, orig_list: Vec<String>) -> Vec<String> {
+//     // Set up matcher (TODO: One time needed only)
+//     let mut matcher = Matcher::new(Config::DEFAULT);
+
+//     // Filter the list items by search pattern
+//     let filtered_matches: Vec<String> = {
+//         let matches = Pattern::parse(search_pattern, CaseMatching::Ignore, Normalization::Smart)
+//             .match_list(orig_list, &mut matcher);
+//         matches.into_iter().map(|f| f.0.to_string()).collect()
+//     };
+//     filtered_matches
+// }
+
+// pub fn filter_entries_by_tag(keyword: &str, orig_list: &Vec<Vec<String>>) -> Vec<Vec<String>> {
+//     let mut filtered_list: Vec<Vec<String>> = Vec::new();
+
+//     for e in orig_list {
+//         if e[4].contains(keyword) {
+//             filtered_list.push(e.to_owned());
+//         }
+//     }
+
+//     filtered_list
+// }