new: added support for numeric caller-line

pamburus · Dec 13, 2023 · ad17009 · ad17009
1 parent 4cb48b3
commit ad17009
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/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.22.0"
+version = "0.22.1"
 edition = "2021"
 build = "build.rs"
 

diff --git a/src/formatting.rs b/src/formatting.rs
@@ -190,8 +190,10 @@ impl RecordFormatter {
                                 }
                                 Caller::FileLine(file, line) => {
                                     buf.extend_from_slice(file.as_bytes());
-                                    buf.push(b':');
-                                    buf.extend_from_slice(line.as_bytes());
+                                    if line.len() != 0 {
+                                        buf.push(b':');
+                                        buf.extend_from_slice(line.as_bytes());
+                                    }
                                 }
                             };
                         });

diff --git a/src/model.rs b/src/model.rs
@@ -363,7 +363,9 @@ impl FieldSettings {
                     to.caller = Some(Caller::FileLine("", value.get()));
                 }
                 Some(Caller::FileLine(_, line)) => {
-                    if let Some(value) = json::from_str(value.get()).ok() {
+                    if value.get().bytes().next().map_or(false, |x| x.is_ascii_digit()) {
+                        *line = value.get()
+                    } else if let Some(value) = json::from_str(value.get()).ok() {
                         *line = value
                     }
                 }