Merge pull request #41 from pamburus/release/0.15.x

new: Now colon delimiter can be used in `--filter` command line option

Cargo.toml

@@ -4,7 +4,7 @@ categories = ["command-line-utilities"]
 description = "Utility for viewing json-formatted log files."
 keywords = ["cli", "human", "log"]
 name = "hl"
-version = "0.15.1"
+version = "0.15.2"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

benches/go/go.mod

@@ -0,0 +1,3 @@
+module github.com/pamburus/hl/benches/go
+
+go 1.20

benches/parse-and-format.rs

@@ -9,7 +9,8 @@ use criterion::{criterion_group, criterion_main, Criterion};
 // local imports
 use hl::{
     timezone::Tz, DateTimeFormatter, Filter, IncludeExcludeKeyFilter, LinuxDateFormat, Parser,
-    ParserSettings, RecordFormatter, SegmentProcesor, Settings, Theme,
+    ParserSettings, RecordFormatter, SegmentProcessor, Settings, Theme,
+    settings,
 };
 
 // ---
@@ -29,9 +30,10 @@ fn benchmark(c: &mut Criterion) {
                     ),
                     false,
                     Arc::new(IncludeExcludeKeyFilter::default()),
+                    settings::Formatting::default(),
                 );
                 let filter = Filter::default();
-                let mut processor = SegmentProcesor::new(&parser, &mut formatter, &filter);
+                let mut processor = SegmentProcessor::new(&parser, &mut formatter, &filter);
                 let mut buf = Vec::new();
                 b.iter(|| {
                     processor.run(record, &mut buf);

src/app.rs

@@ -94,7 +94,7 @@ impl App {
                         self.options.formatting.clone(),
                     )
                     .with_field_unescaping(!self.options.raw_fields);
-                    let mut processor = SegmentProcesor::new(&parser, &mut formatter, &self.options.filter);
+                    let mut processor = SegmentProcessor::new(&parser, &mut formatter, &self.options.filter);
                     for segment in rxi.iter() {
                         match segment {
                             Segment::Complete(segment) => {
@@ -144,13 +144,13 @@ impl App {
 
 // ---
 
-pub struct SegmentProcesor<'a> {
+pub struct SegmentProcessor<'a> {
     parser: &'a Parser,
     formatter: &'a mut RecordFormatter,
     filter: &'a Filter,
 }
 
-impl<'a> SegmentProcesor<'a> {
+impl<'a> SegmentProcessor<'a> {
     pub fn new(parser: &'a Parser, formatter: &'a mut RecordFormatter, filter: &'a Filter) -> Self {
         Self {
             parser,

src/eseq.rs

@@ -14,7 +14,7 @@ pub enum Mode {
     SlowBlink,
     RapidBlink,
     Reverse,
-    Conseal,
+    Conceal,
     CrossedOut,
 }
 

src/lib.rs

@@ -27,7 +27,7 @@ mod scanning;
 pub mod signal;
 
 // public uses
-pub use app::{App, FieldOptions, Options, SegmentProcesor};
+pub use app::{App, FieldOptions, Options, SegmentProcessor};
 pub use datefmt::{DateTimeFormatter, LinuxDateFormat};
 pub use filtering::DefaultNormalizing;
 pub use formatting::RecordFormatter;

src/model.rs

@@ -482,20 +482,26 @@ pub struct FieldFilter {
 
 impl FieldFilter {
     fn parse(text: &str) -> Result<Self> {
-        let mut parts = text.split('=');
-        match (parts.next(), parts.next()) {
-            (Some(key), Some(value)) => {
-                let (key, match_policy, op) = Self::parse_mp_op(key, value)?;
-                let flat_key = key.as_bytes().iter().position(|&x| x == b'.').is_none();
-                Ok(Self {
-                    key: key.into(),
-                    match_policy,
-                    op,
-                    flat_key,
-                })
-            }
-            _ => Err(Error::WrongFieldFilter(text.into())),
+        let parse = |key, value| {
+            let (key, match_policy, op) = Self::parse_mp_op(key, value)?;
+            let flat_key = key.as_bytes().iter().position(|&x| x == b'.').is_none();
+            Ok(Self {
+                key: key.into(),
+                match_policy,
+                op,
+                flat_key,
+            })
+        };
+
+        if let Some(index) = text.find('=') {
+            return parse(&text[0..index], &text[index+1..]);
         }
+
+        if let Some(index) = text.find(':') {
+            return parse(&text[0..index], &text[index+1..]);
+        }
+
+        Err(Error::WrongFieldFilter(text.into()))
     }
 
     fn parse_mp_op<'k>(

src/settings.rs

@@ -117,7 +117,7 @@ pub struct Field {
 
 // ---
 
-#[derive(Debug, Deserialize, Clone)]
+#[derive(Clone, Debug, Default, Deserialize)]
 pub struct Formatting {
     pub punctuation: Punctuation,
 }

src/theme.rs

@@ -162,7 +162,7 @@ impl From<&themecfg::Style> for Style {
             codes.push(
                 match mode {
                     themecfg::Mode::Bold => Mode::Bold,
-                    themecfg::Mode::Conseal => Mode::Conseal,
+                    themecfg::Mode::Conceal => Mode::Conceal,
                     themecfg::Mode::CrossedOut => Mode::CrossedOut,
                     themecfg::Mode::Faint => Mode::Faint,
                     themecfg::Mode::Italic => Mode::Italic,

src/themecfg.rs

@@ -222,7 +222,7 @@ pub enum Mode {
     SlowBlink,
     RapidBlink,
     Reverse,
-    Conseal,
+    Conceal,
     CrossedOut,
 }