diff --git a/.github/release-body.md b/.github/release-body.md index 5b199a1..cae1958 100644 --- a/.github/release-body.md +++ b/.github/release-body.md @@ -1,18 +1,21 @@ -### 2025-02-23 +### 2025-04-18 ### Chores -+ dependencies updated, [e5f355a1928f78abdb64e4c5617d6fac06340016], [4539d8ad0705b46d7c89c51c7be482b696d26e5f], [6aee6181136235a1a4f79af9b9748c1801be8bf8], [64d1bdf2bf88407e02f0eded1e03fcfc5ee2d8e3] -+ .devcontainer dependencies updated, [5c8e76e7bb4d7aab8543c9be09fdbc4ffa446b10] -+ example docker-compose.yml updated, [2354b0b9be1ab3795a421512594b2650b9cbdd74] -+ Rust 1.84 linting, [3065265e26c30d78ba738cfe731d3901ec1948d0] ++ dependencies updated, [8f959c5408995527485e817514c3f4a10bca31bd], [69d1801ea1e71e7d84c00fb2142ba27577e3bb73], [188490e13fd1255eecb305ac0a99a7a1913e0294] ++ Rust 1.86.0 linting, [9acf60334c5224faa9ee4ecf7030b2e9b13b7d67] -### Features -+ Config file introduced, including customizing color scheme of application, closes #47, [f4d54e1ba8ea1516394aef19511a63e6271f27bf] -+ Enable log timestamps to be set to any given timezone, plus custom timestamp format via the config file, closes #56, [7a5e7a25873d2c270e5808730721ebb5427a051] -+ update Rust edition to 2024, [7e4a960b888f1dab524d6045504162cea1171d20] +### Docs ++ comment typo, [723b220c6aa6393b8eebd84a6ddba69f35dc18b8] ### Fixes -+ Only draw screen if data or layout has changed, drastically reduces CPU usage, [bfc295c50e982886ccaa5e60b57f10d3690b3f09] - ++ github workflow update, [997eebca20a2883dcfcb35009dd4d7b0d438dec6] ++ config merging, [a468827f02c5243b9bd4e0183fed16854ae6c851] + +### Refactors ++ rename ChartType to ChartVariant, [bca67116f3b71451156a39a7b0957568b26fa183], [d0caa9271b6f92f52ccfe3dec69708efe54e5170] ++ rename FileType to FileFormat, [848f64d0da429e547a2f6c8de62e4da5f5c9a187] + +### Tests ++ Use insta, closes #57, [9362d7b481ea22eab6f902dc7f3c10150c7ddf22] see CHANGELOG.md for more details diff --git a/CHANGELOG.md b/CHANGELOG.md index b689956..73cf283 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,20 +1,23 @@ +# v0.10.1 +### 2025-04-18 + ### Chores -+ dependencies updated, [8f959c5408995527485e817514c3f4a10bca31bd], [69d1801ea1e71e7d84c00fb2142ba27577e3bb73], [188490e13fd1255eecb305ac0a99a7a1913e0294] -+ Rust 1.86.0 linting, [9acf60334c5224faa9ee4ecf7030b2e9b13b7d67] ++ dependencies updated, [8f959c54](https://github.com/mrjackwills/oxker/commit/8f959c5408995527485e817514c3f4a10bca31bd), [69d1801e](https://github.com/mrjackwills/oxker/commit/69d1801ea1e71e7d84c00fb2142ba27577e3bb73), [188490e1](https://github.com/mrjackwills/oxker/commit/188490e13fd1255eecb305ac0a99a7a1913e0294) ++ Rust 1.86.0 linting, [9acf6033](https://github.com/mrjackwills/oxker/commit/9acf60334c5224faa9ee4ecf7030b2e9b13b7d67) ### Docs -+ comment typo, [723b220c6aa6393b8eebd84a6ddba69f35dc18b8] ++ comment typo, [723b220c](https://github.com/mrjackwills/oxker/commit/723b220c6aa6393b8eebd84a6ddba69f35dc18b8) ### Fixes -+ github workflow update, [997eebca20a2883dcfcb35009dd4d7b0d438dec6] -+ config merging, [a468827f02c5243b9bd4e0183fed16854ae6c851] ++ github workflow update, [997eebca](https://github.com/mrjackwills/oxker/commit/997eebca20a2883dcfcb35009dd4d7b0d438dec6) ++ config merging, [a468827f](https://github.com/mrjackwills/oxker/commit/a468827f02c5243b9bd4e0183fed16854ae6c851) ### Refactors -+ rename ChartType to ChartVariant, [bca67116f3b71451156a39a7b0957568b26fa183], [d0caa9271b6f92f52ccfe3dec69708efe54e5170] -+ rename FileType to FileFormat, [848f64d0da429e547a2f6c8de62e4da5f5c9a187] ++ rename ChartType to ChartVariant, [bca67116](https://github.com/mrjackwills/oxker/commit/bca67116f3b71451156a39a7b0957568b26fa183), [d0caa927](https://github.com/mrjackwills/oxker/commit/d0caa9271b6f92f52ccfe3dec69708efe54e5170) ++ rename FileType to FileFormat, [848f64d0](https://github.com/mrjackwills/oxker/commit/848f64d0da429e547a2f6c8de62e4da5f5c9a187) ### Tests -+ Use insta, closes #57, [9362d7b481ea22eab6f902dc7f3c10150c7ddf22] ++ Use insta, closes [#57](https://github.com/mrjackwills/oxker/issues/57), [9362d7b4](https://github.com/mrjackwills/oxker/commit/9362d7b481ea22eab6f902dc7f3c10150c7ddf22) # v0.10.0 ### 2025-02-23 diff --git a/Cargo.lock b/Cargo.lock index e648f04..5d1571f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1200,7 +1200,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "oxker" -version = "0.10.0" +version = "0.10.1" dependencies = [ "anyhow", "bollard", diff --git a/Cargo.toml b/Cargo.toml index 579260f..699e9f1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "oxker" -version = "0.10.0" +version = "0.10.1" edition = "2024" authors = ["Jack Wills "] description = "A simple tui to view & control docker containers" diff --git a/src/config/parse_config_file.rs b/src/config/parse_config_file.rs index 9bd72df..b198f1b 100644 --- a/src/config/parse_config_file.rs +++ b/src/config/parse_config_file.rs @@ -152,9 +152,10 @@ impl ConfigFile { ConfigFileFormat::JsoncAsJson, ConfigFileFormat::Json, ] { - if let Ok(config_file) = - Self::parse_config_file(file_format, &file_format.get_default_path_name(in_container)) - { + if let Ok(config_file) = Self::parse_config_file( + file_format, + &file_format.get_default_path_name(in_container), + ) { config = Some(config_file); break; } @@ -206,7 +207,8 @@ mod tests { /// All configs parsed and are equal fn test_parse_config_keymap_all() { let example_jsonc = include_str!("../../example_config/example.config.jsonc"); - let result_jsonc = ConfigFile::parse(super::ConfigFileFormat::Jsonc, example_jsonc).unwrap(); + let result_jsonc = + ConfigFile::parse(super::ConfigFileFormat::Jsonc, example_jsonc).unwrap(); assert!(result_jsonc.keymap.is_some()); let result_jsonc = result_jsonc.keymap.unwrap(); @@ -241,7 +243,8 @@ mod tests { /// All configs parsed and are equal fn test_parse_config_colors_all() { let example_jsonc = include_str!("../../example_config/example.config.jsonc"); - let result_jsonc = ConfigFile::parse(super::ConfigFileFormat::Jsonc, example_jsonc).unwrap(); + let result_jsonc = + ConfigFile::parse(super::ConfigFileFormat::Jsonc, example_jsonc).unwrap(); assert!(result_jsonc.colors.is_some()); let result_jsonc = result_jsonc.colors.unwrap();