Skip to content

Commit 461478b

Browse files
bomgarbomgar
committed
rust 2024
1 parent dc068fc commit 461478b

6 files changed

Lines changed: 51 additions & 44 deletions

File tree

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ description = "json log viewer"
88
keywords = ["json", "log", "viewer"]
99
repository = "https://github.com/brocode/fblog"
1010
readme = "README.md"
11-
edition = "2021"
11+
edition = "2024"
1212

1313
[dependencies]
1414
serde_json = "1.0"

‎src/app.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::substitution::Substitution;
2-
use clap::{crate_version, value_parser, ArgAction, ValueHint};
32
use clap::{Arg, Command};
3+
use clap::{ArgAction, ValueHint, crate_version, value_parser};
44
use clap_complete::Shell;
55

66
fn parse_key_value_pair(value: &str) -> Result<(String, String), &'static str> {

‎src/filter.rs‎

Lines changed: 42 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ fn object_to_record(object: &Map<String, Value>, nested: bool) -> String {
3434
let key_name = LUA_IDENTIFIER_CLEANUP.replace_all(key, "_");
3535
write!(script, "{} = ", key_name).expect("Should be able to write to string");
3636
match value {
37-
Value::String(ref string_value) => write!(script, "\"{}\"", escape_lua_string(string_value)).expect("Should be able to write to string"),
38-
Value::Bool(ref bool_value) => script.push_str(&bool_value.to_string()),
39-
Value::Number(ref number_value) => script.push_str(&number_value.to_string()),
37+
Value::String(string_value) => write!(script, "\"{}\"", escape_lua_string(string_value)).expect("Should be able to write to string"),
38+
Value::Bool(bool_value) => script.push_str(&bool_value.to_string()),
39+
Value::Number(number_value) => script.push_str(&number_value.to_string()),
4040
Value::Object(nested_object) => {
4141
let object_string = object_to_record(nested_object, true);
4242
write!(script, "{{{}}}", object_string).expect("Should be able to write to string");
@@ -46,9 +46,9 @@ fn object_to_record(object: &Map<String, Value>, nested: bool) -> String {
4646

4747
for array_value in array_values.iter() {
4848
let lua_array_value = match array_value {
49-
Value::String(ref string_value) => format!("\"{}\"", escape_lua_string(string_value)),
50-
Value::Bool(ref bool_value) => bool_value.to_string(),
51-
Value::Number(ref number_value) => number_value.to_string(),
49+
Value::String(string_value) => format!("\"{}\"", escape_lua_string(string_value)),
50+
Value::Bool(bool_value) => bool_value.to_string(),
51+
Value::Number(number_value) => number_value.to_string(),
5252
_ => "\"unsupported\"".to_string(),
5353
};
5454

@@ -142,13 +142,15 @@ mod tests {
142142
#[test]
143143
fn filter_contains() {
144144
let log_entry: Map<String, Value> = test_log_entry();
145-
assert!(show_log_entry(
146-
&log_entry,
147-
r#"string.find(message, "something") ~= nil"#,
148-
true,
149-
&LogSettings::new_default_settings()
150-
)
151-
.unwrap());
145+
assert!(
146+
show_log_entry(
147+
&log_entry,
148+
r#"string.find(message, "something") ~= nil"#,
149+
true,
150+
&LogSettings::new_default_settings()
151+
)
152+
.unwrap()
153+
);
152154
assert!(!show_log_entry(&log_entry, r#"string.find(message, "bla") ~= nil"#, true, &LogSettings::new_default_settings()).unwrap());
153155
}
154156

@@ -162,32 +164,38 @@ mod tests {
162164
#[test]
163165
fn unknown_variable() {
164166
let log_entry: Map<String, Value> = test_log_entry();
165-
assert!(!show_log_entry(
166-
&log_entry,
167-
r#"sdkfjsdfjsf ~= nil and string.find(sdkfjsdfjsf, "bow.*") ~= nil"#,
168-
true,
169-
&LogSettings::new_default_settings()
170-
)
171-
.unwrap());
167+
assert!(
168+
!show_log_entry(
169+
&log_entry,
170+
r#"sdkfjsdfjsf ~= nil and string.find(sdkfjsdfjsf, "bow.*") ~= nil"#,
171+
true,
172+
&LogSettings::new_default_settings()
173+
)
174+
.unwrap()
175+
);
172176
}
173177

174178
#[test]
175179
fn no_implicit_return() {
176180
let log_entry: Map<String, Value> = test_log_entry();
177-
assert!(show_log_entry(
178-
&log_entry,
179-
r#"if 3 > 2 then return true else return false end"#,
180-
false,
181-
&LogSettings::new_default_settings()
182-
)
183-
.unwrap());
184-
assert!(!show_log_entry(
185-
&log_entry,
186-
r#"if 1 > 2 then return true else return false end"#,
187-
false,
188-
&LogSettings::new_default_settings()
189-
)
190-
.unwrap());
181+
assert!(
182+
show_log_entry(
183+
&log_entry,
184+
r#"if 3 > 2 then return true else return false end"#,
185+
false,
186+
&LogSettings::new_default_settings()
187+
)
188+
.unwrap()
189+
);
190+
assert!(
191+
!show_log_entry(
192+
&log_entry,
193+
r#"if 1 > 2 then return true else return false end"#,
194+
false,
195+
&LogSettings::new_default_settings()
196+
)
197+
.unwrap()
198+
);
191199
}
192200

193201
#[test]

‎src/log.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,16 @@ fn flatten_json(log_entry: &Map<String, Value>, prefix: &str) -> BTreeMap<String
6262
let mut flattened_json: BTreeMap<String, String> = BTreeMap::new();
6363
for (key, value) in log_entry {
6464
match value {
65-
Value::String(ref string_value) => {
65+
Value::String(string_value) => {
6666
flattened_json.insert(format!("{}{}", prefix, key), string_value.to_string());
6767
}
68-
Value::Bool(ref bool_value) => {
68+
Value::Bool(bool_value) => {
6969
flattened_json.insert(format!("{}{}", prefix, key), bool_value.to_string());
7070
}
71-
Value::Number(ref number_value) => {
71+
Value::Number(number_value) => {
7272
flattened_json.insert(format!("{}{}", prefix, key), number_value.to_string());
7373
}
74-
Value::Array(ref array_values) => {
74+
Value::Array(array_values) => {
7575
for (index, array_value) in array_values.iter().enumerate() {
7676
let key = format!("{}[{}]", key, index + 1); // lua tables indexes start with 1
7777

‎src/main.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ mod template;
1414
mod time;
1515

1616
use crate::log_settings::LogSettings;
17-
use clap_complete::{generate, Shell};
17+
use clap_complete::{Shell, generate};
1818
use config::Config;
1919
use std::fs;
2020
use substitution::Substitution;

‎src/template.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
use handlebars::{handlebars_helper, no_escape, Handlebars};
1+
use handlebars::{Handlebars, handlebars_helper, no_escape};
22
use std::convert::TryInto;
33
use yansi::{Color, Paint};
44

5-
pub static DEFAULT_MAIN_LINE_FORMAT: &str =
6-
"{{bold(fixed_size 19 fblog_timestamp)}} {{level_style (uppercase (fixed_size 5 fblog_level))}}:{{#if fblog_prefix}} {{bold(cyan fblog_prefix)}}{{/if}} {{fblog_message}}";
5+
pub static DEFAULT_MAIN_LINE_FORMAT: &str = "{{bold(fixed_size 19 fblog_timestamp)}} {{level_style (uppercase (fixed_size 5 fblog_level))}}:{{#if fblog_prefix}} {{bold(cyan fblog_prefix)}}{{/if}} {{fblog_message}}";
76
pub static DEFAULT_ADDITIONAL_VALUE_FORMAT: &str = "{{bold (color_rgb 150 150 150 (min_size 25 key))}}: {{value}}";
87

98
pub fn fblog_handlebar_registry(main_line_format: String, additional_value_format: String) -> Handlebars<'static> {

0 commit comments

Comments
 (0)