Add Cancel button on path select screen

Author: PabloLec

recoverpy/ui/css/screen-path-edit.css

@@ -20,3 +20,8 @@ PathEditScreen {
     height: 100%;
     align: center middle;
 }
+
+#path-edit-button-container > Button {
+    margin: 0 1;
+    min-width: 16;
+}

recoverpy/ui/screens/screen_path_edit.py

@@ -17,6 +17,7 @@ class PathEditScreen(Screen[None]):
     BINDINGS = [
         Binding("enter", "confirm", "Confirm path", priority=True),
         Binding("escape", "cancel", "Cancel", priority=True),
+        Binding("c", "cancel", "Cancel"),
     ]
 
     def __init__(self, *args, **kwargs) -> None:  # type: ignore
@@ -35,22 +36,30 @@ def compose(self) -> ComposeResult:
         yield self._directory_tree
         yield self._selected_dir_label
         yield Horizontal(
+            Button("Cancel", id="cancel-button", variant="warning"),
             Button("Confirm", id="confirm-button", variant="success"),
             id="path-edit-button-container",
         )
         log.info("path_edit - Path edit screen composed")
 
     def on_mount(self) -> None:
-        self._selected_dir_label.update(f"Selected directory: {self._selected_dir}")
+        self._update_selected_dir_label()
         if self._directory_tree:
             self._directory_tree.focus()
 
+    def set_selected_dir(self, directory: str) -> None:
+        self._selected_dir = directory
+        self._update_selected_dir_label()
+
+    def _update_selected_dir_label(self) -> None:
+        self._selected_dir_label.update(f"Selected directory: {self._selected_dir}")
+
     async def on_directory_tree_directory_selected(
         self, event: DirectoryTree.DirectorySelected
     ) -> None:
         event.stop()
         self._selected_dir = str(event.path)
-        self._selected_dir_label.update(f"Selected directory: {self._selected_dir}")
+        self._update_selected_dir_label()
 
     async def on_directory_tree_file_selected(
         self, event: DirectoryTree.FileSelected
@@ -59,10 +68,13 @@ async def on_directory_tree_file_selected(
         self.notify("Only directories can be selected.", severity="warning")
 
     async def on_button_pressed(self, event: Button.Pressed) -> None:
-        if event.button.id != "confirm-button":
+        if event.button.id not in {"confirm-button", "cancel-button"}:
             return
         event.stop()
-        await self.action_confirm()
+        if event.button.id == "confirm-button":
+            await self.action_confirm()
+        else:
+            self.action_cancel()
 
     async def action_confirm(self) -> None:
         log.info("path_edit - Confirm button pressed")

recoverpy/ui/screens/screen_save.py

@@ -1,6 +1,6 @@
 """Screen used to confirm save."""
 
-from typing import Optional
+from typing import Optional, cast
 
 from textual.app import ComposeResult
 from textual.binding import Binding
@@ -79,6 +79,10 @@ async def _handle_go_back(self) -> None:
 
     async def _handle_edit_save_path(self) -> None:
         log.info("save - Edit save path button pressed")
+        if self._saver:
+            cast(PathEditScreen, self.app.get_screen("path_edit")).set_selected_dir(
+                str(self._saver.save_path)
+            )
         await self.app.push_screen("path_edit")
 
     async def _handle_save(self) -> None:

tests/integration/test_full_workflow.py

@@ -279,6 +279,19 @@ async def test_full_workflow(session_mocker, tmp_path: Path):
         await pilot.press("e")
         await pilot.pause()
 
+        assert pilot.app.screen.name == "path_edit"
+        assert "Selected directory:" in str(pilot.app.screen._selected_dir_label.content)
+
+        # Test cancel path edition (keyboard)
+        await pilot.press("escape")
+        await pilot.pause()
+
+        assert pilot.app.screen.name == "save"
+
+        # Re-open path edit and confirm
+        await pilot.press("e")
+        await pilot.pause()
+
         assert pilot.app.screen.name == "path_edit"
 
         assert isinstance(pilot.app.screen._directory_tree, DirectoryTree)

tests/unit/test_path_edit_screen.py

@@ -29,3 +29,12 @@ async def test_file_selected_keeps_directory_only_and_notifies(session_mocker) -
     notify_mock.assert_called_once_with(
         "Only directories can be selected.", severity="warning"
     )
+
+
+def test_set_selected_dir_updates_label() -> None:
+    screen = PathEditScreen()
+
+    screen.set_selected_dir("/tmp")
+
+    assert screen._selected_dir == "/tmp"
+    assert str(screen._selected_dir_label.content) == "Selected directory: /tmp"