From 7503153d915206bfea10afc97ca03178eca06c14 Mon Sep 17 00:00:00 2001 From: One <43485962+c-git@users.noreply.github.com> Date: Sat, 28 Dec 2024 22:10:46 -0500 Subject: [PATCH 1/5] chore: change to dev version number --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 94c26a3..9823ecf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2102,7 +2102,7 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "log_viewer" -version = "0.3.0" +version = "0.3.1-dev" dependencies = [ "anyhow", "eframe", diff --git a/Cargo.toml b/Cargo.toml index b74a4e2..bd10d05 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "log_viewer" -version = "0.3.0" +version = "0.3.1-dev" edition = "2021" [dependencies] From 3a5d16e66e045bfc4bff103a34baabd27bb1cc0b Mon Sep 17 00:00:00 2001 From: One <43485962+c-git@users.noreply.github.com> Date: Sat, 28 Dec 2024 22:52:07 -0500 Subject: [PATCH 2/5] chore: add todo --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index bd10d05..29e9a46 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ serde_json = "1.0.134" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] env_logger = "0.11.6" poll-promise = { version = "0.3.0", features = ["tokio"] } -tokio = { version = "1.35.1", features = ["full"] } +tokio = { version = "1.35.1", features = ["full"] } # TODO 2: Reduce features of tokio to only those needed # web: [target.'cfg(target_arch = "wasm32")'.dependencies] From 57018643749dd530fea9c384835fa7186d69624f Mon Sep 17 00:00:00 2001 From: One <43485962+c-git@users.noreply.github.com> Date: Sun, 29 Dec 2024 10:59:26 -0500 Subject: [PATCH 3/5] chore: get bacon working with reset testing --- .vscode/settings.json | 1 + bacon.toml | 7 +------ scripts/remove_settings_and_run_with_default.sh | 11 ----------- 3 files changed, 2 insertions(+), 17 deletions(-) delete mode 100755 scripts/remove_settings_and_run_with_default.sh diff --git a/.vscode/settings.json b/.vscode/settings.json index 49aa159..dd7bbbc 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,6 +6,7 @@ "libxcb", "libxkbcommon", "logviewer", + "pkill", "xfixes" ] } diff --git a/bacon.toml b/bacon.toml index af4ec61..b722551 100644 --- a/bacon.toml +++ b/bacon.toml @@ -1,15 +1,10 @@ # This is a configuration file for the bacon tool -# -# Complete help on configuration: https://dystroy.org/bacon/config/ -# -#  You may check the current default at -# https://github.com/Canop/bacon/blob/main/defaults/default-bacon.toml [jobs.reset-settings-and-run] command = [ "sh", "-c", - "./scripts/remove_settings_and_run_with_default.sh", + "trash ~/.local/share/logviewer/app.ron; cargo run", ] need_stdout = true allow_warnings = true diff --git a/scripts/remove_settings_and_run_with_default.sh b/scripts/remove_settings_and_run_with_default.sh deleted file mode 100755 index 149ae32..0000000 --- a/scripts/remove_settings_and_run_with_default.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -SETTINGS_FILE=~/.local/share/logviewer/app.ron -if [ -e $SETTINGS_FILE ] -then - trash $SETTINGS_FILE - echo "Trashed settings file before run" -else - echo "Settings file not found, so not deleted." -fi -cargo run \ No newline at end of file From 1a7e48331ee88a730fab957ab7a9b98cc7c8d699 Mon Sep 17 00:00:00 2001 From: One <43485962+c-git@users.noreply.github.com> Date: Sun, 29 Dec 2024 19:28:01 -0500 Subject: [PATCH 4/5] fix: make matching field request_id again --- src/app/data_display_options.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/data_display_options.rs b/src/app/data_display_options.rs index 5ec9aca..0211504 100644 --- a/src/app/data_display_options.rs +++ b/src/app/data_display_options.rs @@ -95,7 +95,7 @@ impl Default for DataDisplayOptions { .into_iter() .map(String::from) .collect(), - emphasize_if_matching_field_idx: Some(2), + emphasize_if_matching_field_idx: Some(3), row_idx_field_name: Some("row#".to_string()), row_parse_error_handling: Default::default(), level_conversion: Some(Default::default()), From 92a360428093ce0ec90fa5611c0bc1138c6ed987 Mon Sep 17 00:00:00 2001 From: One <43485962+c-git@users.noreply.github.com> Date: Sun, 29 Dec 2024 19:28:31 -0500 Subject: [PATCH 5/5] chore: version bump 0.3.1 --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9823ecf..9a9299b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2102,7 +2102,7 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "log_viewer" -version = "0.3.1-dev" +version = "0.3.1" dependencies = [ "anyhow", "eframe", diff --git a/Cargo.toml b/Cargo.toml index 29e9a46..0c87f78 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "log_viewer" -version = "0.3.1-dev" +version = "0.3.1" edition = "2021" [dependencies]