Merge pull request #166 from ClementTsang/fix_or_in_search

CHANGELOG.md

@@ -29,6 +29,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Fixed a bug where bottom would incorrectly read the wrong values to calculate the read/write columns for processes in Linux.
 
+- Fixed a bug where OR operations in the process query wouldn't work for process names.
+
 ## [0.4.3] - 2020-05-15
 
 ### Other

src/app/query.rs

@@ -7,8 +7,10 @@ use crate::{
     },
 };
 use std::collections::VecDeque;
+use std::fmt::Debug;
 
 const DELIMITER_LIST: [char; 6] = ['=', '>', '<', '(', ')', '\"'];
+const COMPARISON_LIST: [&str; 3] = [">", "=", "<"];
 const OR_LIST: [&str; 2] = ["or", "||"];
 const AND_LIST: [&str; 2] = ["and", "&&"];
 
@@ -40,36 +42,13 @@ impl ProcessQuery for ProcWidgetState {
     fn parse_query(&self) -> Result<Query> {
         fn process_string_to_filter(query: &mut VecDeque<String>) -> Result<Query> {
             let lhs = process_or(query)?;
-            let mut and_query = And {
+            let mut list_of_ors = vec![lhs];
-                lhs: Prefix {
-                    or: Some(Box::from(lhs)),
-                    compare_prefix: None,
-                    regex_prefix: None,
-                },
-                rhs: None,
-            };
 
             while query.front().is_some() {
-                let rhs = process_or(query)?;
+                list_of_ors.push(process_or(query)?);
-
-                and_query = And {
-                    lhs: Prefix {
-                        or: Some(Box::from(Or {
-                            lhs: and_query,
-                            rhs: None,
-                        })),
-                        compare_prefix: None,
-                        regex_prefix: None,
-                    },
-                    rhs: Some(Box::from(Prefix {
-                        or: Some(Box::from(rhs)),
-                        compare_prefix: None,
-                        regex_prefix: None,
-                    })),
-                }
             }
 
-            Ok(Query { query: and_query })
+            Ok(Query { query: list_of_ors })
         }
 
         fn process_or(query: &mut VecDeque<String>) -> Result<Or> {
@@ -77,6 +56,7 @@ impl ProcessQuery for ProcWidgetState {
             let mut rhs: Option<Box<And>> = None;
 
             while let Some(queue_top) = query.front() {
+                // debug!("OR QT: {:?}", queue_top);
                 if OR_LIST.contains(&queue_top.to_lowercase().as_str()) {
                     query.pop_front();
                     rhs = Some(Box::new(process_and(query)?));
@@ -97,6 +77,8 @@ impl ProcessQuery for ProcWidgetState {
                     } else {
                         break;
                     }
+                } else if COMPARISON_LIST.contains(&queue_top.to_lowercase().as_str()) {
+                    return Err(QueryError("Comparison not valid here".into()));
                 } else {
                     break;
                 }
@@ -110,14 +92,14 @@ impl ProcessQuery for ProcWidgetState {
             let mut rhs: Option<Box<Prefix>> = None;
 
             while let Some(queue_top) = query.front() {
-                if queue_top == ")" {
+                // debug!("AND QT: {:?}", queue_top);
-                    break;
+                if AND_LIST.contains(&queue_top.to_lowercase().as_str()) {
-                } else if AND_LIST.contains(&queue_top.to_lowercase().as_str()) {
                     query.pop_front();
-                }
+
                     rhs = Some(Box::new(process_prefix(query, false)?));
 
-                if query.front().is_some() {
+                    if let Some(next_queue_top) = query.front() {
+                        if AND_LIST.contains(&next_queue_top.to_lowercase().as_str()) {
                             // Must merge LHS and RHS
                             lhs = Prefix {
                                 or: Some(Box::new(Or {
@@ -131,54 +113,25 @@ impl ProcessQuery for ProcWidgetState {
                         } else {
                             break;
                         }
+                    } else {
+                        break;
+                    }
+                } else if COMPARISON_LIST.contains(&queue_top.to_lowercase().as_str()) {
+                    return Err(QueryError("Comparison not valid here".into()));
+                } else {
+                    break;
+                }
             }
 
             Ok(And { lhs, rhs })
         }
 
-        fn process_prefix(query: &mut VecDeque<String>, inside_quotations: bool) -> Result<Prefix> {
+        fn process_prefix(query: &mut VecDeque<String>, inside_quotation: bool) -> Result<Prefix> {
             if let Some(queue_top) = query.pop_front() {
-                // debug!("QT: {:?}", queue_top);
+                // debug!("Prefix QT: {:?}", queue_top);
-                if !inside_quotations && queue_top == "(" {
-                    if query.front().is_none() {
-                        return Err(QueryError("Missing closing parentheses".into()));
-                    }
 
-                    // Get content within bracket; and check if paren is complete
+                if inside_quotation {
-                    let or = process_or(query)?;
+                    if queue_top == "\"" {
-                    if let Some(close_paren) = query.pop_front() {
-                        if close_paren.to_lowercase() == ")" {
-                            return Ok(Prefix {
-                                or: Some(Box::new(or)),
-                                regex_prefix: None,
-                                compare_prefix: None,
-                            });
-                        } else {
-                            return Err(QueryError("Missing closing parentheses".into()));
-                        }
-                    } else {
-                        return Err(QueryError("Missing closing parentheses".into()));
-                    }
-                } else if !inside_quotations && queue_top == ")" {
-                    // This is actually caught by the regex creation, but it seems a bit
-                    // sloppy to leave that up to that to do so...
-
-                    return Err(QueryError("Missing opening parentheses".into()));
-                } else if !inside_quotations && queue_top == "\"" {
-                    // Similar to parentheses, trap and check for missing closing quotes.  Note, however, that we
-                    // will DIRECTLY call another process_prefix call...
-
-                    let prefix = process_prefix(query, true)?;
-                    if let Some(close_paren) = query.pop_front() {
-                        if close_paren.to_lowercase() == "\"" {
-                            return Ok(prefix);
-                        } else {
-                            return Err(QueryError("Missing closing quotation".into()));
-                        }
-                    } else {
-                        return Err(QueryError("Missing closing quotation".into()));
-                    }
-                } else if inside_quotations && queue_top == "\"" {
                         // This means we hit something like "".  Return an empty prefix, and to deal with
                         // the close quote checker, add one to the top of the stack.  Ugly fix but whatever.
                         query.push_front("\"".to_string());
@@ -190,6 +143,103 @@ impl ProcessQuery for ProcWidgetState {
                             )),
                             compare_prefix: None,
                         });
+                    } else {
+                        let mut quoted_string = queue_top;
+                        while let Some(next_str) = query.front() {
+                            if next_str == "\"" {
+                                // Stop!
+                                break;
+                            } else {
+                                quoted_string.push_str(next_str);
+                                query.pop_front();
+                            }
+                        }
+                        return Ok(Prefix {
+                            or: None,
+                            regex_prefix: Some((
+                                PrefixType::Name,
+                                StringQuery::Value(quoted_string),
+                            )),
+                            compare_prefix: None,
+                        });
+                    }
+                } else if queue_top == "(" {
+                    if query.is_empty() {
+                        return Err(QueryError("Missing closing parentheses".into()));
+                    }
+
+                    let mut list_of_ors = VecDeque::new();
+
+                    while let Some(in_paren_query_top) = query.front() {
+                        if in_paren_query_top != ")" {
+                            list_of_ors.push_back(process_or(query)?);
+                        } else {
+                            break;
+                        }
+                    }
+
+                    // Ensure not empty
+                    if list_of_ors.is_empty() {
+                        return Err(QueryError("No values within parentheses group".into()));
+                    }
+
+                    // Now convert this back to a OR...
+                    let initial_or = Or {
+                        lhs: And {
+                            lhs: Prefix {
+                                or: Some(Box::new(list_of_ors.pop_front().unwrap())),
+                                compare_prefix: None,
+                                regex_prefix: None,
+                            },
+                            rhs: None,
+                        },
+                        rhs: None,
+                    };
+                    let returned_or = list_of_ors.into_iter().fold(initial_or, |lhs, rhs| Or {
+                        lhs: And {
+                            lhs: Prefix {
+                                or: Some(Box::new(lhs)),
+                                compare_prefix: None,
+                                regex_prefix: None,
+                            },
+                            rhs: Some(Box::new(Prefix {
+                                or: Some(Box::new(rhs)),
+                                compare_prefix: None,
+                                regex_prefix: None,
+                            })),
+                        },
+                        rhs: None,
+                    });
+
+                    if let Some(close_paren) = query.pop_front() {
+                        if close_paren == ")" {
+                            return Ok(Prefix {
+                                or: Some(Box::new(returned_or)),
+                                regex_prefix: None,
+                                compare_prefix: None,
+                            });
+                        } else {
+                            return Err(QueryError("Missing closing parentheses".into()));
+                        }
+                    } else {
+                        return Err(QueryError("Missing closing parentheses".into()));
+                    }
+                } else if queue_top == ")" {
+                    return Err(QueryError("Missing opening parentheses".into()));
+                } else if queue_top == "\"" {
+                    // Similar to parentheses, trap and check for missing closing quotes.  Note, however, that we
+                    // will DIRECTLY call another process_prefix call...
+
+                    let prefix = process_prefix(query, true)?;
+                    if let Some(close_paren) = query.pop_front() {
+                        if close_paren == "\"" {
+                            return Ok(prefix);
+                        } else {
+                            return Err(QueryError("Missing closing quotation".into()));
+                        }
+                    } else {
+                        return Err(QueryError("Missing closing quotation".into()));
+                    }
                 } else {
                     //  Get prefix type...
                     let prefix_type = queue_top.parse::<PrefixType>()?;
@@ -201,36 +251,13 @@ impl ProcessQuery for ProcWidgetState {
 
                     if let Some(content) = content {
                         match &prefix_type {
-                            PrefixType::Name if !inside_quotations => {
+                            PrefixType::Name => {
                                 return Ok(Prefix {
                                     or: None,
                                     regex_prefix: Some((prefix_type, StringQuery::Value(content))),
                                     compare_prefix: None,
                                 })
                             }
-                            PrefixType::Name if inside_quotations => {
-                                // If *this* is the case, then we must peek until we see a closing quote and add it all together...
-
-                                let mut final_content = content;
-                                while let Some(next_str) = query.front() {
-                                    if next_str == "\"" {
-                                        // Stop!
-                                        break;
-                                    } else {
-                                        final_content.push_str(next_str);
-                                        query.pop_front();
-                                    }
-                                }
-
-                                return Ok(Prefix {
-                                    or: None,
-                                    regex_prefix: Some((
-                                        prefix_type,
-                                        StringQuery::Value(final_content),
-                                    )),
-                                    compare_prefix: None,
-                                });
-                            }
                             PrefixType::Pid => {
                                 // We have to check if someone put an "="...
                                 if content == "=" {
@@ -372,9 +399,12 @@ impl ProcessQuery for ProcWidgetState {
                         return Err(QueryError("Missing argument for search prefix".into()));
                     }
                 }
+            } else if inside_quotation {
+                // Uh oh, it's empty with quotes!
+                return Err(QueryError("Missing closing quotation".into()));
             }
 
-            Err(QueryError("Invalid search".into()))
+            Err(QueryError("Invalid query".into()))
         }
 
         let mut split_query = VecDeque::new();
@@ -407,10 +437,9 @@ impl ProcessQuery for ProcWidgetState {
     }
 }
 
-#[derive(Debug)]
 pub struct Query {
     /// Remember, AND > OR, but AND must come after OR when we parse.
-    pub query: And,
+    pub query: Vec<Or>,
 }
 
 impl Query {
@@ -418,19 +447,29 @@ impl Query {
         &mut self, is_searching_whole_word: bool, is_ignoring_case: bool,
         is_searching_with_regex: bool,
     ) -> Result<()> {
-        self.query.process_regexes(
+        for or in &mut self.query {
+            or.process_regexes(
                 is_searching_whole_word,
                 is_ignoring_case,
                 is_searching_with_regex,
-        )
+            )?;
+        }
+
+        Ok(())
     }
 
     pub fn check(&self, process: &ConvertedProcessData) -> bool {
-        self.query.check(process)
+        self.query.iter().all(|ok| ok.check(process))
     }
 }
 
-#[derive(Debug)]
+impl Debug for Query {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_fmt(format_args!("{:?}", self.query))
+    }
+}
+
+#[derive(Default)]
 pub struct Or {
     pub lhs: And,
     pub rhs: Option<Box<And>>,
@@ -466,7 +505,16 @@ impl Or {
     }
 }
 
-#[derive(Debug)]
+impl Debug for Or {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match &self.rhs {
+            Some(rhs) => f.write_fmt(format_args!("({:?} OR {:?})", self.lhs, rhs)),
+            None => f.write_fmt(format_args!("{:?}", self.lhs)),
+        }
+    }
+}
+
+#[derive(Default)]
 pub struct And {
     pub lhs: Prefix,
     pub rhs: Option<Box<Prefix>>,
@@ -502,6 +550,15 @@ impl And {
     }
 }
 
+impl Debug for And {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match &self.rhs {
+            Some(rhs) => f.write_fmt(format_args!("({:?} AND {:?})", self.lhs, rhs)),
+            None => f.write_fmt(format_args!("{:?}", self.lhs)),
+        }
+    }
+}
+
 #[derive(Debug)]
 pub enum PrefixType {
     Pid,
@@ -535,7 +592,7 @@ impl std::str::FromStr for PrefixType {
     }
 }
 
-#[derive(Debug)]
+#[derive(Default)]
 pub struct Prefix {
     pub or: Option<Box<Or>>,
     pub regex_prefix: Option<(PrefixType, StringQuery)>,
@@ -645,11 +702,26 @@ impl Prefix {
                 _ => true,
             }
         } else {
+            // Somehow we have an empty condition... oh well.  Return true.
             true
         }
     }
 }
 
+impl Debug for Prefix {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        if let Some(or) = &self.or {
+            f.write_fmt(format_args!("{:?}", or))
+        } else if let Some(regex_prefix) = &self.regex_prefix {
+            f.write_fmt(format_args!("{:?}", regex_prefix))
+        } else if let Some(compare_prefix) = &self.compare_prefix {
+            f.write_fmt(format_args!("{:?}", compare_prefix))
+        } else {
+            f.write_fmt(format_args!(""))
+        }
+    }
+}
+
 #[derive(Debug)]
 pub enum QueryComparison {
     Equal,

src/app/states.rs

@@ -205,7 +205,7 @@ impl ProcWidgetState {
             self.process_search_state.search_state.error_message = None;
         } else {
             let parsed_query = self.parse_query();
-            // debug!("PQ: {:#?}", parsed_query);
+            // debug!("Parsed query: {:#?}", parsed_query);
 
             if let Ok(parsed_query) = parsed_query {
                 self.process_search_state.search_state.query = Some(parsed_query);