feat: allow case insensitive matches

Author: c-git

src/app.rs

@@ -503,6 +503,7 @@ impl LogViewerApp {
                 let FilterConfig {
                     search_key,
                     filter_on,
+                    is_case_sensitive,
                     comparator,
                 } = filter;
                 ui.label("Search Key: ");
@@ -512,6 +513,9 @@ impl LogViewerApp {
                     should_apply_filter = true;
                 }
 
+                ui.spacing();
+                ui.checkbox(is_case_sensitive, "Case Sensitive");
+
                 ui.spacing();
                 egui::ComboBox::from_label("")
                     .selected_text(format!("{}", comparator))

src/app/data.rs

@@ -1,4 +1,7 @@
-use std::collections::{BTreeMap, BTreeSet};
+use std::{
+    borrow::Cow,
+    collections::{BTreeMap, BTreeSet},
+};
 
 use anyhow::Context;
 use data_iter::DataIter;
@@ -16,7 +19,7 @@ pub mod filter;
 #[serde(default)]
 pub struct Data {
     pub selected_row: Option<usize>,
-    pub filter: Option<filter::FilterConfig>,
+    pub filter: Option<FilterConfig>,
     rows: Vec<LogRow>,
     filtered_rows: Option<Vec<usize>>,
 }
@@ -137,6 +140,7 @@ impl Data {
     }
 
     pub fn move_selected_to_next(&mut self) {
+        // TODO 1: Fix index values used
         if let Some(selected) = self.selected_row.as_mut() {
             if *selected < self.rows.len() - 1 {
                 *selected += 1;
@@ -216,15 +220,36 @@ fn is_included(
         search_key,
         filter_on,
         comparator,
+        is_case_sensitive,
     } = filter;
     let fields_and_values = row.as_slice(common_fields);
+    let search_key = if *is_case_sensitive {
+        search_key
+    } else {
+        &search_key.to_lowercase()
+    };
+    let mut iter = fields_and_values.iter().map(|(k, v)| {
+        if *is_case_sensitive {
+            (Cow::Borrowed(k), Cow::Borrowed(v))
+        } else {
+            (Cow::Owned(k.to_lowercase()), Cow::Owned(v.to_lowercase()))
+        }
+    });
+
     match filter_on {
-        filter::FilterOn::Any => fields_and_values
-            .iter()
-            .any(|(_, value)| comparator.apply(search_key, value)),
-        filter::FilterOn::Field(FieldSpecifier { name }) => fields_and_values
-            .iter()
-            .any(|(field_name, value)| name == field_name && comparator.apply(search_key, value)),
+        filter::FilterOn::Any => {
+            iter.any(|(_, value)| comparator.apply(search_key, value.as_str()))
+        }
+        filter::FilterOn::Field(FieldSpecifier { name }) => {
+            let name = if *is_case_sensitive {
+                name
+            } else {
+                &name.to_lowercase()
+            };
+            iter.any(|(field_name, value)| {
+                name == field_name.as_str() && comparator.apply(search_key, value.as_str())
+            })
+        }
     }
 }
 

src/app/data/data_iter.rs

@@ -48,6 +48,7 @@ mod tests {
     use super::*;
 
     #[test]
+    #[allow(clippy::iter_nth_zero)]
     fn nth_no_reverse() {
         let row0 = super::super::tests::create_log_row_no_extra();
         let row1 = super::super::tests::create_log_row_with_extra();

src/app/data/filter.rs

@@ -5,6 +5,7 @@ use std::fmt::Display;
 pub struct FilterConfig {
     pub search_key: String,
     pub filter_on: FilterOn,
+    pub is_case_sensitive: bool,
     pub comparator: Comparator,
 }
 

src/lib.rs

@@ -3,6 +3,5 @@
 mod app;
 pub use app::LogViewerApp;
 
-// TODO 1: On enter apply filter
 // TODO 3: Add button to set to current value if a field is selected
 // TODO 3: Support auto reload (look into watching for changes) https://watchexec.github.io/