diff --git a/.github/release-body.md b/.github/release-body.md
index 6c315b1..cdef158 100644
--- a/.github/release-body.md
+++ b/.github/release-body.md
@@ -1,9 +1,9 @@
-### 2025-04-19
+### 2025-04-22
### Chores
-+ dependencies updated, [1345ecb1a2b17ad3d288f2de2058c0777b84f93b]
++ dependencies updated, [bbfd2462a1f45008587b488e8c6049ee76da72f2]
### Tests
-+ use a fixed version String, `0.00.000`, in tests, [230174b3c327c3f217cdcf8fce07d5d9ddea1033]
++ fix tests for MacOS, closes #61, [cfc2decd8d237f1ac3f0bdb2b3d5581684064448]
see CHANGELOG.md for more details
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85652ab..05cf8d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# v0.10.3
+### 2025-04-22
+
+### Chores
++ dependencies updated, [bbfd2462](https://github.com/mrjackwills/oxker/commit/bbfd2462a1f45008587b488e8c6049ee76da72f2)
+
+### Tests
++ fix tests for MacOS, closes [#61](https://github.com/mrjackwills/oxker/issues/61), [cfc2decd](https://github.com/mrjackwills/oxker/commit/cfc2decd8d237f1ac3f0bdb2b3d5581684064448)
+
# v0.10.2
### 2025-04-19
diff --git a/Cargo.lock b/Cargo.lock
index 4571690..51f6e24 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -992,9 +992,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
[[package]]
name = "jiff"
-version = "0.2.8"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ad87c89110f55e4cd4dc2893a9790820206729eaf221555f742d540b0724a0"
+checksum = "5a064218214dc6a10fbae5ec5fa888d80c45d611aba169222fc272072bf7aef6"
dependencies = [
"jiff-static",
"jiff-tzdb",
@@ -1008,9 +1008,9 @@ dependencies = [
[[package]]
name = "jiff-static"
-version = "0.2.8"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d076d5b64a7e2fe6f0743f02c43ca4a6725c0f904203bfe276a5b3e793103605"
+checksum = "199b7932d97e325aff3a7030e141eafe7f2c6268e1d1b24859b753a627f45254"
dependencies = [
"proc-macro2",
"quote",
@@ -1200,7 +1200,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
name = "oxker"
-version = "0.10.2"
+version = "0.10.3"
dependencies = [
"anyhow",
"bollard",
@@ -1595,9 +1595,9 @@ dependencies = [
[[package]]
name = "signal-hook-registry"
-version = "1.4.3"
+version = "1.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28b4eafe8a2d82f83559ef5941afff1ccba3da8e375c8f148efd75df181bf4f"
+checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
dependencies = [
"libc",
]
diff --git a/Cargo.toml b/Cargo.toml
index e325408..a2c42fa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "oxker"
-version = "0.10.2"
+version = "0.10.3"
edition = "2024"
authors = ["Jack Wills "]
description = "A simple tui to view & control docker containers"
diff --git a/src/config/keymap_parser.rs b/src/config/keymap_parser.rs
index c187af9..0de79ec 100644
--- a/src/config/keymap_parser.rs
+++ b/src/config/keymap_parser.rs
@@ -215,6 +215,8 @@ impl From> for Keymap {
impl Keymap {
/// Try to parse a &[String] into a Vec of keycodes, at most the output will have 2 entries
+ /// This might fail on MacOS due to Backspace and Delete working in a different manner as to how they work on Linux & Windows
+ /// I think that on MacOS `Del` becomes `Fwd Del`, and `Backspace` becomes `Delete`
fn try_parse_keycode(input: &[String]) -> Option> {
let mut output = vec![];
@@ -245,8 +247,10 @@ impl Keymap {
"f10" => Some(KeyCode::F(10)),
"f11" => Some(KeyCode::F(11)),
"f12" => Some(KeyCode::F(12)),
+ // Might fail on MacOS, see note above
"backspace" => Some(KeyCode::Backspace),
"backtab" => Some(KeyCode::BackTab),
+ // Might fail on MacOS, see note above
"delete" => Some(KeyCode::Delete),
"down" => Some(KeyCode::Down),
"end" => Some(KeyCode::End),
@@ -394,7 +398,7 @@ mod tests {
sort_by_id: gen_v(("[", "]")),
sort_by_image: gen_v(("A", "B")),
sort_by_rx: gen_v(("C", "D")),
- sort_by_tx: gen_v(("backspace", "TAB")),
+ sort_by_tx: gen_v(("insert", "TAB")),
sort_reset: gen_v(("up", "down")),
toggle_help: gen_v(("home", "end")),
toggle_mouse_capture: gen_v(("pagedown", "PAGEUP")),
@@ -426,7 +430,7 @@ mod tests {
sort_by_id: (KeyCode::Char('['), Some(KeyCode::Char(']'))),
sort_by_image: (KeyCode::Char('A'), Some(KeyCode::Char('B'))),
sort_by_rx: (KeyCode::Char('C'), Some(KeyCode::Char('D'))),
- sort_by_tx: (KeyCode::Backspace, Some(KeyCode::Tab)),
+ sort_by_tx: (KeyCode::Insert, Some(KeyCode::Tab)),
sort_reset: (KeyCode::Up, Some(KeyCode::Down)),
toggle_help: (KeyCode::Home, Some(KeyCode::End)),
toggle_mouse_capture: (KeyCode::PageDown, Some(KeyCode::PageUp)),
diff --git a/src/ui/draw_blocks/help.rs b/src/ui/draw_blocks/help.rs
index 49b1d0e..35ede46 100644
--- a/src/ui/draw_blocks/help.rs
+++ b/src/ui/draw_blocks/help.rs
@@ -581,7 +581,7 @@ mod tests {
sort_by_id: (KeyCode::Char('/'), None),
sort_by_image: (KeyCode::Char(','), None),
sort_by_rx: (KeyCode::Char('.'), None),
- sort_by_tx: (KeyCode::Backspace, None),
+ sort_by_tx: (KeyCode::Insert, None),
sort_reset: (KeyCode::Up, None),
toggle_help: (KeyCode::Home, None),
toggle_mouse_capture: (KeyCode::PageDown, None),
@@ -626,9 +626,9 @@ mod tests {
sort_by_id: (KeyCode::Char('/'), Some(KeyCode::Char('='))),
sort_by_image: (KeyCode::Char(','), Some(KeyCode::Char('\\'))),
sort_by_rx: (KeyCode::Char('.'), Some(KeyCode::Char(']'))),
- sort_by_tx: (KeyCode::Backspace, Some(KeyCode::BackTab)),
+ sort_by_tx: (KeyCode::Insert, Some(KeyCode::BackTab)),
sort_reset: (KeyCode::Up, Some(KeyCode::Down)),
- toggle_help: (KeyCode::Home, Some(KeyCode::Delete)),
+ toggle_help: (KeyCode::Home, Some(KeyCode::End)),
toggle_mouse_capture: (KeyCode::PageDown, Some(KeyCode::PageUp)),
};
@@ -671,7 +671,7 @@ mod tests {
sort_by_id: (KeyCode::Char('/'), Some(KeyCode::Char('='))),
sort_by_image: (KeyCode::Char(','), None),
sort_by_rx: (KeyCode::Char('.'), Some(KeyCode::Char(']'))),
- sort_by_tx: (KeyCode::Backspace, None),
+ sort_by_tx: (KeyCode::Insert, None),
sort_reset: (KeyCode::Up, Some(KeyCode::Down)),
toggle_help: (KeyCode::Home, None),
toggle_mouse_capture: (KeyCode::PageDown, Some(KeyCode::PageUp)),
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_one_definition.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_one_definition.snap
index 52a69ec..384ea0a 100644
--- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_one_definition.snap
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_one_definition.snap
@@ -39,7 +39,7 @@ expression: setup.terminal.backend()
" │ ( / ) sort containers by id │ "
" │ ( , ) sort containers by image │ "
" │ ( . ) sort containers by rx │ "
-" │ ( Backspace ) sort containers by tx │ "
+" │ ( Insert ) sort containers by tx │ "
" │ ( a ) close dialog │ "
" │ ( k ) quit at any time │ "
" │ │ "
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_two_definitions.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_two_definitions.snap
index 1e0241e..03504ba 100644
--- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_two_definitions.snap
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_two_definitions.snap
@@ -26,7 +26,7 @@ expression: setup.terminal.backend()
" │ ( u ) or ( v ) scroll list to start │ "
" │ ( enter ) send docker container command │ "
" │ ( g ) or ( h ) exec into a container │ "
-" │ ( Home ) or ( Del ) toggle this help information - or click heading │ "
+" │ ( Home ) or ( End ) toggle this help information - or click heading │ "
" │ ( m ) or ( n ) save logs to file │ "
" │ ( Page Down ) or ( Page Up ) toggle mouse capture - if disabled, text on screen can be selected & copied │ "
" │ ( i ) or ( j ) enter filter mode │ "
@@ -39,7 +39,7 @@ expression: setup.terminal.backend()
" │ ( / ) or ( = ) sort containers by id │ "
" │ ( , ) or ( \ ) sort containers by image │ "
" │ ( . ) or ( ] ) sort containers by rx │ "
-" │ ( Backspace ) or ( Back Tab ) sort containers by tx │ "
+" │ ( Insert ) or ( Back Tab ) sort containers by tx │ "
" │ ( a ) or ( b ) close dialog │ "
" │ ( k ) or ( l ) quit at any time │ "
" │ │ "
diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_one_and_two_definitions.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_one_and_two_definitions.snap
index 7278795..f6dfd9d 100644
--- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_one_and_two_definitions.snap
+++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_one_and_two_definitions.snap
@@ -39,7 +39,7 @@ expression: setup.terminal.backend()
" │ ( / ) or ( = ) sort containers by id │ "
" │ ( , ) sort containers by image │ "
" │ ( . ) or ( ] ) sort containers by rx │ "
-" │ ( Backspace ) sort containers by tx │ "
+" │ ( Insert ) sort containers by tx │ "
" │ ( a ) or ( b ) close dialog │ "
" │ ( k ) quit at any time │ "
" │ │ "