chore: merge release-v0.6.4 into main

mrjackwills · May 25, 2024 · 8d862f2 · 8d862f2
2 parents f24f63c + 499c659
commit 8d862f2
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 62 deletions.
diff --git a/.github/release-body.md b/.github/release-body.md
@@ -1,20 +1,12 @@
-### 2024-05-07
+### 2024-05-25
 
 ### Chores
-+ Dependencies updated, [07e293ac2ce2e7deb5735154fcdb24ef83a19b67], [27d72c547e738f6816cd4b353ac881e454a0be70]
++ Dependencies updated, [51fdd26be5b3166bcff5c26ece6d6ec0d893381e], [c1be658b8cc4786a9a7f2e0a88568019b3995c14]
 
-### Features
-+ Allow closing dialogs with `Escape`, thanks [JCQuintas](https://github.com/JCQuintas), [0e4c3ceab933458d40b54d5fcff7e6cf7a3ab315]
+### Docs
++ exec mode "not available on Windows", in both README.md and help panel, [df449a85376bbeec87215952d6a9196721f7132e]
 
 ### Fixes
-+ correct header display when terminal width changes, [4628803b2b9fe63522d033b192763ed6ff5b57dd]
-
-### Refactors
-+ use tokio CancellationToken, [0631a73ec27530f8fcc88988a0a02ca75e32c5ba]
-+ impl AsyncTTY, [bf33776e9a61684032a80d22d995ba7e0446620e]
-
-### Tests
-+ reduced header section test, [aa0947405393db2c306e86986183514cbc0f5a75]
-+ test_draw_blocks_help() with add esc text, [ff839af4ef68193149d6456e70fee189228c4a44]
++ closes #36 Double key strokes on Windows, [9b7d575a76398cbe19e17f6494baf802dbb512b9]
 
 see <a href='https://github.com/mrjackwills/oxker/blob/main/CHANGELOG.md'>CHANGELOG.md</a> for more details
diff --git a/.github/workflows/create_release_and_build.yml b/.github/workflows/create_release_and_build.yml
@@ -101,7 +101,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: publish to crates.io
-        uses: katyo/publish-crates@v1
+        uses: katyo/publish-crates@v2
         with:
           registry-token: ${{ secrets.CRATES_IO_TOKEN }}
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.6.4'>v0.6.4</a>
+### 2024-05-25
+
+### Chores
++ Dependencies updated, [51fdd26b](https://github.com/mrjackwills/oxker/commit/51fdd26be5b3166bcff5c26ece6d6ec0d893381e), [c1be658b](https://github.com/mrjackwills/oxker/commit/c1be658b8cc4786a9a7f2e0a88568019b3995c14)
+
+### Docs
++ exec mode "not available on Windows", in both README.md and help panel, [df449a85](https://github.com/mrjackwills/oxker/commit/df449a85376bbeec87215952d6a9196721f7132e)
+
+### Fixes
++ closes [#36](https://github.com/mrjackwills/oxker/issues/36) Double key strokes on Windows, [9b7d575a](https://github.com/mrjackwills/oxker/commit/9b7d575a76398cbe19e17f6494baf802dbb512b9)
+
 # <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.6.3'>v0.6.3</a>
 ### 2024-05-07
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "oxker"
-version = "0.6.3"
+version = "0.6.4"
 edition = "2021"
 authors = ["Jack Wills <[email protected]>"]
 description = "A simple tui to view & control docker containers"

diff --git a/README.md b/README.md
@@ -101,7 +101,7 @@ In application controls
 | ```( enter )```| Run selected docker command.|
 | ```( 1-9 )``` | Sort containers by heading, clicking on headings also sorts the selected column. |
 | ```( 0 )``` | Stop sorting.|
-| ```( e )``` | Exec into the selected container.|
+| ```( e )``` | Exec into the selected container - not available on Windows.|
 | ```( h )``` | Toggle help menu.|
 | ```( m )``` | Toggle mouse capture - if disabled, text on screen can be selected.|
 | ```( q )``` | Quit.|

diff --git a/src/ui/draw_blocks.rs b/src/ui/draw_blocks.rs
@@ -681,6 +681,8 @@ impl HelpInfo {
                 space(),
                 button_item("e"),
                 button_desc("exec into a container"),
+                #[cfg(target_os = "windows")]
+                button_desc(" - not available on Windows"),
             ]),
             Line::from(vec![
                 space(),

diff --git a/src/ui/mod.rs b/src/ui/mod.rs
@@ -179,10 +179,12 @@ impl Ui {
             if crossterm::event::poll(self.input_poll_rate).unwrap_or(false) {
                 if let Ok(event) = event::read() {
                     if let Event::Key(key) = event {
-                        self.input_tx
-                            .send(InputMessages::ButtonPress((key.code, key.modifiers)))
-                            .await
-                            .ok();
+                        if key.kind == event::KeyEventKind::Press {
+                            self.input_tx
+                                .send(InputMessages::ButtonPress((key.code, key.modifiers)))
+                                .await
+                                .ok();
+                        }
                     } else if let Event::Mouse(m) = event {
                         match m.kind {
                             event::MouseEventKind::Down(_)