New filter changes now (should work) in TUI.

Author: mendelsshop

cargo-function-history/src/app/mod.rs

@@ -363,7 +363,7 @@ impl App<'_> {
                 }
                 filter_name => {
                     if let Some(filters) =
-                        function_grep::filter::Filters::default().get_filter(*filter_name)
+                        function_grep::filter::Filters::default().get_filter(filter_name)
                     {
                         let rest = command_iter.copied().collect::<Vec<_>>().join(" ");
                         let filt = match filters.to_filter(&rest) {

function-grep/src/filter.rs

@@ -1,7 +1,7 @@
 use general_filters::{FunctionInImpl, FunctionInLines, FunctionWithParameterRust};
 use std::{
     collections::{hash_map, HashMap},
-    fmt,
+    fmt::{self, Display},
     hash::Hash,
 };
 
@@ -185,13 +185,14 @@ impl<Supports> InstantiatedFilter<Supports> {
     }
 }
 
+#[derive(Debug, PartialEq, Eq)]
 pub struct All;
 impl From<All> for SupportedLanguages {
     fn from(_: All) -> Self {
         Self::All
     }
-    // add code here
 }
+#[derive(Debug, PartialEq, Eq)]
 pub struct Language(String);
 impl From<Language> for SupportedLanguages {
     fn from(value: Language) -> Self {
@@ -205,12 +206,13 @@ macro_rules! default_filters {
         HashMap::from([$(($filter.filter_info().filter_name().to_string(), &$filter as &'static dyn Filter)),*])
     };
 }
+#[derive(Debug, PartialEq, Eq)]
 pub struct Many<T: Info<Supported = Language>> {
     pub name: String,
     pub filters: HashMap<String, T>,
 }
 
-trait Info {
+pub trait Info {
     type Supported;
     fn filter_name(&self) -> String;
 }
@@ -220,6 +222,7 @@ pub type FilterType<'a> =
     SingleOrMany<&'a dyn Filter<Supports = All>, &'a dyn Filter<Supports = Language>>;
 pub type InstantiatedFilterType =
     SingleOrMany<InstantiatedFilter<All>, InstantiatedFilter<Language>>;
+#[derive(Debug, PartialEq, Eq)]
 pub enum SingleOrMany<A: Info<Supported = All>, M: Info<Supported = Language>> {
     All(A),
     Many(Many<M>),
@@ -228,21 +231,43 @@ impl<A: Info<Supported = All>, M: Info<Supported = Language>> SingleOrMany<A, M>
     #[must_use]
     pub fn filter_name(&self) -> String {
         match self {
-            SingleOrMany::All(f) => f.filter_name(),
-            SingleOrMany::Many(many) => many.name.clone(),
+            Self::All(f) => f.filter_name(),
+            Self::Many(many) => many.name.clone(),
         }
     }
 
     #[must_use]
     pub fn supports(&self) -> SupportedLanguages {
         match self {
-            SingleOrMany::All(_) => SupportedLanguages::All,
-            SingleOrMany::Many(many) => {
+            Self::All(_) => SupportedLanguages::All,
+            Self::Many(many) => {
                 SupportedLanguages::Many(many.filters.keys().cloned().collect())
             }
         }
     }
 }
+impl<A: Info<Supported = All>, M: Info<Supported = Language>> Display for SingleOrMany<A, M> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.filter_name())
+    }
+}
+impl<'a> FilterType<'a> {
+    pub fn to_filter(&self, s: &str) -> Result<InstantiatedFilterType, String> {
+        match self {
+            SingleOrMany::All(a) => a.to_filter(s).map(SingleOrMany::All),
+            SingleOrMany::Many(Many { name, filters }) => filters
+                .iter()
+                .map(|(name, f)| f.to_filter(s).map(|f| (name.clone(), f)))
+                .collect::<Result<HashMap<_, _>, _>>()
+                .map(|filters| {
+                    SingleOrMany::Many(Many {
+                        name: name.to_string(),
+                        filters,
+                    })
+                }),
+        }
+    }
+}
 pub struct Filters<'a> {
     filters: HashMap<String, FilterType<'a>>,
 }
@@ -256,7 +281,7 @@ where
         self.filter_info().filter_name().to_string()
     }
 }
-impl<T> Info for InstantiatedFilter< T>
+impl<T> Info for InstantiatedFilter<T>
 where
     SupportedLanguages: From<T>,
 {

function_history_backend_thread/src/types.rs

@@ -1,6 +1,6 @@
 use std::fmt;
 
-use function_grep::filter::InstantiatedFilter;
+use function_grep::filter::InstantiatedFilterType;
 use git_function_history::{FileFilterType, Filter, FunctionHistory};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
@@ -145,7 +145,7 @@ pub enum HistoryFilterType {
     FileAbsolute(String),
     FileRelative(String),
     Directory(String),
-    PL(InstantiatedFilter),
+    PL(InstantiatedFilterType),
     None,
 }
 

git-function-history-gui/src/types.rs

@@ -1,4 +1,4 @@
-use function_grep::filter::SingleOrMany;
+use function_grep::filter::FilterType;
 use std::{collections::HashMap, fmt};
 
 pub enum HistoryFilterType {
@@ -8,7 +8,7 @@ pub enum HistoryFilterType {
     FileAbsolute(String),
     FileRelative(String),
     Directory(String),
-    PL(HashMap<String, String>, SingleOrMany<'static>),
+    PL(HashMap<String, String>, FilterType<'static>),
     None,
 }
 

git-function-history-lib/src/lib.rs

@@ -91,7 +91,7 @@ pub enum Filter {
     Message(String),
     /// when you want to filter by proggramming language filter
     #[enumstuff(skip)]
-    PLFilter(function_grep::filter::InstantiatedFilter),
+    PLFilter(function_grep::filter::InstantiatedFilterType),
     /// when you want to filter to only have files that are in a specific language
     Language(String),
     /// When you want to filter by nothing.

git-function-history-lib/src/types.rs

@@ -219,7 +219,7 @@ pub struct FunctionHistory {
 
 impl FunctionHistory {
     // creates a new `FunctionHistory` from a list of commits
-    pub fn new(name: String, commit_history: Vec<Commit>) -> Self {
+    pub const fn new(name: String, commit_history: Vec<Commit>) -> Self {
         Self {
             name,
             commit_history,
@@ -451,9 +451,8 @@ impl Iterator for FunctionHistory {
         self.commit_history
             .get(self.current_iter_pos)
             .cloned()
-            .map(|c| {
+            .inspect(|c| {
                 self.current_iter_pos += 1;
-                c
             })
     }
 }