athaller/hstdb - Change L3I6AA6NRA3KLTUADBDDKYYJUT3YS2R34XSVBBCK3XAY7YO3ZVJAC

Command filter will now only match if command matches exactly

This avoids problems when the filter command is a substring of a entry command. Instead the filter will check the first element of the entry command (split by whitespace) and check if that element matches exactly. It will also check each command of each pipe instead of just the fist command used in a pipe.

For example the following will not match anymore:

» histdb-rs -c &#x27;tr&#x27; --all-hosts
 tmn         cmd
 2020-06-19  trayer --edge top --align right --width 10 --height 27 --monitor 0 --transparent
             false --tint 0x00000000

But the following will now match

» histdb-rs -c &#x27;tr&#x27; --all-hosts
 tmn         cmd
 12:58       echo &quot;test test&quot; | tr -d &#x27; &#x27;

To get the old behaviour use the regex matcher instead:

» cargo run -- -t &#x27;^tr.*&#x27; --all-hosts
 tmn         cmd
 2020-06-19  trayer --edge top --align right --width 10 --height 27 --monitor 0 --transparent
             false --tint 0x00000000

Created by Alexander Thaller on October 20, 2020

L3I6AA6NRA3KLTUADBDDKYYJUT3YS2R34XSVBBCK3XAY7YO3ZVJAC

Dependencies

[2] CK2R6STAMMOQCX3HD676VNU6LCNG4BSIV2ZSEEFWVUWW4TPFW73AC

In channels

main

Change contents

Replacement in src/store/filter.rs at line 80 [2.6449]

B:BD[2.8351] → [2.8351:8490]

                self.command
                    .as_ref()
                    .map_or(true, |command| entry.command.starts_with(command))

[2.8351]

[2.8490]

                self.command.as_ref().map_or(true, |command| {
                    Self::filter_command(&entry.command, command)
                })

Insertion in src/store/filter.rs at line 106 [2.6449]

[2.9179]

    }
    fn filter_command(entry_command: &str, command: &str) -> bool {
        entry_command
            .split('|')
            .map(|pipe_command| {
                pipe_command
                    .split_whitespace()
                    .next()
                    .map_or(false, |entry_command| entry_command == command)
            })
            .any(|has_command| has_command)
    }
}
#[cfg(test)]
mod test {
    use super::Filter;
    #[test]
    fn filter_command() {
        let cases = vec![
            ("tr -d ' '", true),
            ("echo 'tr'", false),
            ("echo 'test test' | tr -d ' '", true),
            ("echo 'test test' | echo tr -d ' '", false),
        ];
        let command = "tr";
        for case in cases {
            assert_eq!(Filter::filter_command(case.0, command), case.1)
        }