data-sourcerer 0.2.3__py3-none-any.whl → 0.3.0__py3-none-any.whl

sourcerer/presentation/screens/file_system_finder/widgets/file_system_navigator.py

@@ -21,6 +21,7 @@ from sourcerer.presentation.screens.shared.containers import (
     ScrollHorizontalContainerWithNoBindings,
     ScrollVerticalContainerWithNoBindings,
 )
+from sourcerer.presentation.settings import KeyBindings
 from sourcerer.settings import DIRECTORY_ICON, DOUBLE_CLICK_THRESHOLD, FILE_ICON
 
 
@@ -48,7 +49,7 @@ class FileSystemWidget(Widget):
             background: $block-cursor-blurred-background;
             text-style: $block-cursor-blurred-text-style;
         }
-        
+
         .folder-name {
             text-overflow: ellipsis;
             text-wrap: nowrap;
@@ -161,7 +162,7 @@ class FileSystemWidget(Widget):
             Calls the `on_click` method if the pressed key is "enter", which may trigger
             folder navigation or file opening depending on the widget's context.
         """
-        if event.key == "enter":
+        if event.key == KeyBindings.ENTER.value:
             self.on_file_select()
 
     def on_file_select(self):
@@ -232,11 +233,13 @@ class FileSystemNavigator(ScrollHorizontalContainerWithNoBindings):
 
     # Consolidate key binding data
     BINDINGS: ClassVar[list[BindingType]] = [
-        Binding("enter", "select_cursor", "Select", show=False),
-        Binding("up", "cursor_up", "Cursor up", show=False),
-        Binding("down", "cursor_down", "Cursor down", show=False),
-        Binding("left", "cursor_left", "Cursor left", show=False),
-        Binding("right", "cursor_right", "Cursor right", show=False),
+        Binding(KeyBindings.ENTER.value, "select_cursor", "Select", show=False),
+        Binding(KeyBindings.ARROW_UP.value, "cursor_up", "Cursor up", show=False),
+        Binding(KeyBindings.ARROW_DOWN.value, "cursor_down", "Cursor down", show=False),
+        Binding(KeyBindings.ARROW_LEFT.value, "cursor_left", "Cursor left", show=False),
+        Binding(
+            KeyBindings.ARROW_RIGHT.value, "cursor_right", "Cursor right", show=False
+        ),
     ]
 
     MAIN_CONTAINER_ID: ClassVar[str] = "dirs_content"
@@ -306,9 +309,9 @@ class FileSystemNavigator(ScrollHorizontalContainerWithNoBindings):
         )
         self._focus_first_child(path_listing_container)
 
-        self.path_listing_containers_uuids[str(self.work_dir)] = (
-            path_listing_container.id
-        )
+        self.path_listing_containers_uuids[
+            str(self.work_dir)
+        ] = path_listing_container.id
 
     def action_cursor_down(self) -> None:
         """
@@ -626,9 +629,9 @@ class FileSystemNavigator(ScrollHorizontalContainerWithNoBindings):
         await self._mount_path_listing_container(path_listing_container)
 
         if str(folder_path) not in self.path_listing_containers_uuids:
-            self.path_listing_containers_uuids[str(folder_path)] = (
-                path_listing_container.id
-            )
+            self.path_listing_containers_uuids[
+                str(folder_path)
+            ] = path_listing_container.id
 
     @on(FileSystemWidget.Focus)
     def on_folder_focus(self, event: FileSystemWidget.Focus):

sourcerer/presentation/screens/main/main.py

@@ -2,19 +2,23 @@ import time
 import traceback
 from concurrent.futures import ThreadPoolExecutor
 from pathlib import Path
+from typing import ClassVar
 
+from dependency_injector.wiring import Provide
 from textual import on, work
 from textual.app import App, ComposeResult
-from textual.binding import Binding
+from textual.binding import Binding, BindingType
 from textual.containers import Horizontal
 from textual.reactive import reactive
 from textual.widgets import Footer
 
+from sourcerer.domain.storage_provider.entities import Storage
 from sourcerer.infrastructure.access_credentials.services import CredentialsService
 from sourcerer.infrastructure.storage_provider.exceptions import (
     ListStorageItemsError,
 )
 from sourcerer.infrastructure.utils import generate_uuid
+from sourcerer.presentation.di_container import DiContainer
 from sourcerer.presentation.screens.critical_error.main import CriticalErrorScreen
 from sourcerer.presentation.screens.file_system_finder.main import (
     FileSystemNavigationModal,
@@ -55,6 +59,8 @@ from sourcerer.presentation.screens.storage_action_progress.main import (
     StorageActionProgressScreen,
     UploadKey,
 )
+from sourcerer.presentation.screens.storages_list.main import StoragesListScreen
+from sourcerer.presentation.settings import KeyBindings
 from sourcerer.presentation.themes.github_dark import github_dark_theme
 from sourcerer.presentation.utils import (
     get_provider_service_by_access_credentials,
@@ -93,12 +99,28 @@ class Sourcerer(App, ResizeContainersWatcherMixin):
     """
 
     CSS_PATH = "styles.tcss"
-    BINDINGS = [Binding("ctrl+r", "registrations", "Registrations list")]
+    BINDINGS: ClassVar[list[BindingType]] = [
+        Binding("ctrl+r", "registrations", "Registrations list"),
+        Binding("ctrl+s", "storages", "Storages list"),
+        Binding(
+            KeyBindings.ARROW_LEFT.value, "focus_sidebar", "Focus sidebar", show=False
+        ),
+        Binding(
+            KeyBindings.ARROW_RIGHT.value, "focus_content", "Focus content", show=False
+        ),
+    ]
     is_storage_list_loading = reactive(False, recompose=True)
 
-    def __init__(self, *args, **kwargs):
+    def __init__(
+        self,
+        credentials_service: CredentialsService = Provide[
+            DiContainer.credentials_service
+        ],
+        *args,
+        **kwargs,
+    ):
         super().__init__(*args, **kwargs)
-        self.credentials_service = CredentialsService()
+        self.credentials_service = credentials_service
         self.storage_list_sidebar = StorageListSidebar(id="storage_list_sidebar")
         self.storage_content = StorageContentContainer(id="storage_content_container")
         self.load_percentage = 0
@@ -130,6 +152,18 @@ class Sourcerer(App, ResizeContainersWatcherMixin):
         self.theme = "github-dark"
         self.init_storages_list()
 
+    def action_focus_content(self):
+        """
+        Focuses the storage content container.
+        """
+        self.storage_content.focus()
+
+    def action_focus_sidebar(self):
+        """
+        Focuses the storage list sidebar.
+        """
+        self.storage_list_sidebar.focus()
+
     def action_registrations(self):
         """
         Opens the provider credentials list screen and refreshes the storage list.
@@ -142,6 +176,9 @@ class Sourcerer(App, ResizeContainersWatcherMixin):
         """
         self.app.push_screen(ProviderCredsListScreen(), callback=self.refresh_storages)
 
+    def action_storages(self):
+        self.app.push_screen(StoragesListScreen(), callback=self.refresh_storages)
+
     def refresh_storages(self, *args, **kwargs):
         """
         Refreshes the storage list by clearing the current storages and
@@ -206,7 +243,11 @@ class Sourcerer(App, ResizeContainersWatcherMixin):
             5. Notify the user if an error occurs during the retrieval process.
         """
         self.refresh_storage_content(
-            event.access_credentials_uuid, event.name, event.path, event.prefix
+            event.access_credentials_uuid,
+            event.name,
+            event.path,
+            event.prefix,
+            event.focus_content,
         )
 
     @on(UploadRequest)
@@ -381,7 +422,12 @@ class Sourcerer(App, ResizeContainersWatcherMixin):
         self.uncheck_files_request(UncheckFilesRequest(keys=[]))
 
     def refresh_storage_content(
-        self, access_credentials_uuid, storage_name, path, prefix=None
+        self,
+        access_credentials_uuid,
+        storage_name,
+        path,
+        prefix=None,
+        focus_content=False,
     ):
         """
         Refreshes the storage content display with items from the specified storage path.
@@ -407,6 +453,7 @@ class Sourcerer(App, ResizeContainersWatcherMixin):
         self.storage_content.storage_content = None
         self.storage_content.selected_files = set()
         self.storage_content.selected_files_n = 0
+        self.storage_content.focus_content = focus_content
 
         provider_service = get_provider_service_by_access_uuid(
             access_credentials_uuid, self.credentials_service
@@ -421,7 +468,7 @@ class Sourcerer(App, ResizeContainersWatcherMixin):
                 **params
             )
         except ListStorageItemsError as e:
-            self.notify_error(f"""Could not extract storage content \n{str(e)}""")
+            self.notify_error(f"""Could not extract storage content \n{e}""")
 
     def _upload_file(
         self,
@@ -509,7 +556,15 @@ class Sourcerer(App, ResizeContainersWatcherMixin):
 
         try:
             storages = provider_service.list_storages()
-            self.storage_list_sidebar.storages[credentials.uuid] = storages
+            storage_names = [storage.storage for storage in storages]
+            registered_storages = [
+                Storage(credentials.provider, storage.name, storage.created_at)
+                for storage in credentials.storages
+                if storage.name not in storage_names
+            ]
+            self.storage_list_sidebar.storages[credentials.uuid] = (
+                storages + registered_storages
+            )
             self.storage_list_sidebar.last_update_timestamp = time.time()
         except Exception:
             self.notify_error(f"Could not get storages list for {credentials.name}!")

sourcerer/presentation/screens/main/messages/select_storage_item.py

@@ -9,3 +9,4 @@ class SelectStorageItem(Message):
     path: str | None = None
     access_credentials_uuid: str | None = None
     prefix: str | None = None
+    focus_content: bool = False

sourcerer/presentation/screens/main/mixins/resize_containers_watcher_mixin.py

@@ -1,4 +1,5 @@
 import time
+from typing import ClassVar
 
 from textual.events import MouseMove, MouseUp
 
@@ -28,7 +29,7 @@ class ResizeContainersWatcherMixin:
     and is inherited from textual App.
     """
 
-    required_methods = ["query_one", "refresh"]
+    required_methods: ClassVar[list[str]] = ["query_one", "refresh"]
 
     def __init_subclass__(cls, **kwargs):
         super().__init_subclass__(**kwargs)

sourcerer/presentation/screens/main/widgets/storage_content.py

@@ -7,18 +7,20 @@ display with search functionality.
 
 import contextlib
 import os.path
+from abc import abstractmethod
 from dataclasses import dataclass
 from enum import Enum, auto
+from typing import ClassVar, Self
 
 from textual import events, on
 from textual.app import ComposeResult
+from textual.binding import Binding, BindingType
 from textual.containers import (
     Center,
     Container,
     Horizontal,
     Middle,
     Vertical,
-    VerticalScroll,
 )
 from textual.css.query import NoMatches
 from textual.message import Message
@@ -38,8 +40,11 @@ from sourcerer.presentation.screens.main.messages.uncheck_files_request import (
     UncheckFilesRequest,
 )
 from sourcerer.presentation.screens.main.messages.upload_request import UploadRequest
+from sourcerer.presentation.screens.shared.containers import (
+    ScrollVerticalContainerWithNoBindings,
+)
 from sourcerer.presentation.screens.shared.widgets.button import Button
-from sourcerer.presentation.settings import NO_DATA_LOGO
+from sourcerer.presentation.settings import NO_DATA_LOGO, KeyBindings
 from sourcerer.settings import (
     DIRECTORY_ICON,
     DOWNLOAD_ICON,
@@ -91,6 +96,10 @@ class ActionType(Enum):
         return action_map[action_str]
 
 
+class UnfocusableCheckbox(Checkbox):
+    can_focus = False
+
+
 class FileMetaLabel(Static):
     """Widget for displaying file metadata information.
 
@@ -120,6 +129,16 @@ class PathSelector(Label):
         access_credentials_uuid: UUID of the access credentials being used
     """
 
+    can_focus = True
+
+    DEFAULT_CSS = """
+    PathSelector {
+        &:focus {
+            background: $secondary-lighten-2;
+        }
+    }
+    """
+
     def __init__(self, storage, path, access_credentials_uuid, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.storage = storage
@@ -128,31 +147,93 @@ class PathSelector(Label):
 
     def on_click(self, _: events.Click) -> None:
         """Handle click events to navigate to the selected path."""
+        self._select()
+
+    def on_key(self, event: events.Key) -> None:
+        """Handle key events to navigate to the selected path."""
+        if event.key == KeyBindings.ENTER.value:
+            self._select()
+
+    def _select(self):
+        """Select the current path."""
         self.post_message(
-            SelectStorageItem(self.storage, self.path, self.access_credentials_uuid)
+            SelectStorageItem(
+                self.storage,
+                self.path,
+                self.access_credentials_uuid,
+                focus_content=True,
+            )
         )
 
 
-class FolderItem(Horizontal):
+class StorageContentItem(Horizontal):
+    DEFAULT_CSS = """
+        StorageContentItem.active {
+            background: $secondary;
+            color: $panel;
+        }
+        StorageContentItem:focus {
+            background: $secondary-lighten-2;
+            color: $panel;
+        }
+        """
+
+    can_focus = True
+
+    def __init__(self, focus_first: bool, *args, **kwargs):
+        """Initialize the storage content widget."""
+        super().__init__(*args, **kwargs)
+        self.focus_first = focus_first
+
+    def on_mount(self) -> None:
+        """Handle the mounting of the widget."""
+        if self.focus_first and self.first_child:
+            self.focus()
+
+    @abstractmethod
+    def _select(self, widget=None):
+        raise NotImplementedError
+
+    def on_click(self, event: events.Click) -> None:
+        """Handle click events to navigate into the folder."""
+        self._select(event.widget)
+
+    def on_key(self, event: events.Key) -> None:
+        """Handle key events to navigate into the folder."""
+        if event.key == KeyBindings.ARROW_UP.value:
+            if self.first_child:
+                self.parent.children[-1].focus()  # type: ignore
+                return
+            self.screen.focus_previous()
+        if event.key == KeyBindings.ARROW_DOWN.value:
+            if self.last_child:
+                self.parent.children[0].focus()  # type: ignore
+                return
+            self.screen.focus_next()
+
+    @on(events.Enter)
+    @on(events.Leave)
+    def on_enter(self, _: events.Enter):
+        with contextlib.suppress(Exception):
+            self.set_class(self.is_mouse_over, "active")
+
+
+class FolderItem(StorageContentItem):
     """Widget for displaying and interacting with folder items.
 
     This widget represents a folder in the storage content view, allowing
     navigation into the folder and visual feedback on hover/selection.
     """
 
-    DEFAULT_CSS = """
-    FolderItem {
-        margin-bottom: 1;
-    }
-    FolderItem.active {
-        background: $secondary;
-        color: $panel;
-    }
-    """
-    can_focus = False
-
     def __init__(
-        self, storage, access_credentials_uuid, parent_path, folder, *args, **kwargs
+        self,
+        storage,
+        access_credentials_uuid,
+        parent_path,
+        folder,
+        focus_first,
+        *args,
+        **kwargs,
     ):
         """Initialize a folder item widget.
 
@@ -162,7 +243,7 @@ class FolderItem(Horizontal):
             parent_path: The parent path of the folder
             folder: The folder name
         """
-        super().__init__(*args, **kwargs)
+        super().__init__(focus_first, *args, **kwargs)
         self.storage = storage
         self.access_credentials_uuid = access_credentials_uuid
         self.parent_path = parent_path
@@ -172,26 +253,29 @@ class FolderItem(Horizontal):
         """Compose the folder item layout with folder name and icon."""
         yield Label(f"{DIRECTORY_ICON}{self.folder.key}", markup=False)
 
-    def on_click(self, _: events.Click) -> None:
-        """Handle click events to navigate into the folder."""
+    def _select(self, widget=None):
+        """Select the folder."""
         path = self.folder.key
         if self.parent_path:
             path = self.parent_path.strip("/") + "/" + path
 
         self.post_message(
-            SelectStorageItem(self.storage, path, self.access_credentials_uuid)
+            SelectStorageItem(
+                self.storage, path, self.access_credentials_uuid, focus_content=True
+            )
         )
 
-    def on_mouse_move(self, _) -> None:
-        """Handle mouse move events to highlight the folder."""
-        self.add_class("active")
-
-    def on_leave(self, _) -> None:
-        """Handle mouse leave events to remove highlight."""
-        self.remove_class("active")
+    def on_key(self, event: events.Key) -> None:
+        """Handle key events to navigate into the folder."""
+        if event.key in (KeyBindings.ARROW_UP.value, KeyBindings.ARROW_DOWN.value):
+            event.prevent_default()
+        if event.key == KeyBindings.ENTER.value:
+            self._select()
+            return
+        super().on_key(event)
 
 
-class FileItem(Horizontal):
+class FileItem(StorageContentItem):
     """Widget for displaying and interacting with file items.
 
     This widget represents a file in the storage content view, allowing
@@ -199,17 +283,10 @@ class FileItem(Horizontal):
     """
 
     DEFAULT_CSS = """
-    FileItem {
-        margin-bottom: 1;
-    }
-    FileItem.active {
-        background: $secondary;
-        color: $panel;
-    }
     .file_size {
         color: $primary
     }
-    Checkbox {
+    UnfocusableCheckbox {
         border: none;
         padding: 0 0;
         display: none;
@@ -219,7 +296,6 @@ class FileItem(Horizontal):
         }
     }
     """
-    can_focus = False
 
     @dataclass
     class Selected(Message):
@@ -239,11 +315,7 @@ class FileItem(Horizontal):
 
         name: str
 
-    def on_mount(self):
-        """Initialize the file item on mount."""
-        self.add_class("file-item")
-
-    def __init__(self, storage, parent_path, file, *args, **kwargs):
+    def __init__(self, storage, parent_path, file, focus_first, *args, **kwargs):
         """Initialize a file item widget.
 
         Args:
@@ -251,13 +323,13 @@ class FileItem(Horizontal):
             parent_path: The parent path of the file
             file: The file name
         """
-        super().__init__(*args, **kwargs)
+        super().__init__(focus_first, *args, **kwargs)
         self.storage = storage
         self.parent_path = parent_path
         self.file = file
 
     def compose(self):
-        yield Checkbox()
+        yield UnfocusableCheckbox()
         yield FileMetaLabel(
             f"{FILE_ICON} {self.file.key}", classes="file_name", markup=False
         )
@@ -268,42 +340,45 @@ class FileItem(Horizontal):
         if self.file.is_text:
             yield Button(f"{PREVIEW_ICON}", name="preview", classes="download")
 
-    def on_mouse_move(self, _) -> None:
-        """Handle mouse move events to highlight the file."""
-        self.add_class("active")
-
-    def on_leave(self, _) -> None:
-        """Handle mouse leave events to remove highlight."""
-        self.remove_class("active")
+    def on_key(self, event: events.Key) -> None:
+        """Handle key events to toggle file selection."""
+        if event.key in (KeyBindings.ARROW_UP.value, KeyBindings.ARROW_DOWN.value):
+            event.prevent_default()
+        if event.key == KeyBindings.ENTER.value:
+            checkbox = self.query_one(UnfocusableCheckbox)
+            checkbox.value = not checkbox.value
+            if checkbox.value:
+                self.post_message(self.Selected(self.file.key))
+            else:
+                self.post_message(self.Unselect(self.file.key))
+            return
+        super().on_key(event)
 
-    def on_click(self, event: events.Click) -> None:
-        """Handle click events to toggle file selection."""
+    def _select(self, widget=None):
         preview_button = None
         with contextlib.suppress(NoMatches):
             preview_button = self.query_one(Button)
 
-        if event.widget is preview_button:
+        if widget is preview_button:
             self.post_message(self.Preview(self.file.key))
             return
 
-        checkbox = self.query_one(Checkbox)
-        if event.widget is not checkbox:
+        checkbox = self.query_one(UnfocusableCheckbox)
+        if widget is not checkbox:
             checkbox.value = not checkbox.value
         if checkbox.value:
             self.post_message(self.Selected(self.file.key))
         else:
             self.post_message(self.Unselect(self.file.key))
-        event.prevent_default()
-        event.stop()
 
     def uncheck(self):
         """Uncheck the file's checkbox."""
-        checkbox = self.query_one(Checkbox)
+        checkbox = self.query_one(UnfocusableCheckbox)
         checkbox.value = False
 
     def check(self):
         """Check the file's checkbox."""
-        checkbox = self.query_one(Checkbox)
+        checkbox = self.query_one(UnfocusableCheckbox)
         checkbox.value = True
 
 
@@ -340,6 +415,16 @@ class StorageContentContainer(Vertical):
     ] = reactive(None, recompose=True)
     selected_files: reactive[set] = reactive(set(), recompose=False)
     selected_files_n: reactive[int] = reactive(0, recompose=False)
+    focus_content: reactive[bool] = reactive(False, recompose=False)
+
+    BINDINGS: ClassVar[list[BindingType]] = [
+        Binding(
+            f"{KeyBindings.CTRL.value}+{KeyBindings.BACKSPACE.value}",
+            "back_to_prev_path",
+            "Navigate back to the previous path",
+            show=True,
+        ),
+    ]
 
     DEFAULT_CSS = """
 
@@ -375,7 +460,7 @@ class StorageContentContainer(Vertical):
         width: 100%;
         height: auto;
         border-bottom: solid $secondary;
-        margin: 1 0;
+        margin: 1 0 0 0;
 
         PathSelector {
             &.primary_color {
@@ -524,13 +609,28 @@ class StorageContentContainer(Vertical):
             yield FileMetaLabel("Size", classes="file_size")
             yield FileMetaLabel("Date modified", classes="file_date")
             yield FileMetaLabel("Preview", classes="preview")
-        with VerticalScroll(id="content"):
+        with ScrollVerticalContainerWithNoBindings(id="content", can_focus=False):
             for folder in self.storage_content.folders:
                 yield FolderItem(
-                    self.storage, self.access_credentials_uuid, self.path, folder
+                    self.storage,
+                    self.access_credentials_uuid,
+                    self.path,
+                    folder,
+                    self.focus_content,
                 )
             for file in self.storage_content.files:
-                yield FileItem(self.storage, self.path, file, id=file.uuid)
+                yield FileItem(
+                    self.storage, self.path, file, self.focus_content, id=file.uuid
+                )
+
+    def focus(self, scroll_visible: bool = True) -> Self:
+        try:
+            content = self.query_one(ScrollVerticalContainerWithNoBindings)
+        except NoMatches:
+            return self
+        if len(content.children) > 0:
+            content.children[0].focus()
+        return self
 
     @on(Input.Submitted)
     def on_input_submitted(self, event: Input.Submitted):
@@ -545,19 +645,6 @@ class StorageContentContainer(Vertical):
         """
         self.apply_search_prefix(event.value)
 
-    @on(Input.Blurred)
-    def on_input_blurred(self, event: Input.Blurred):
-        """
-        Handle input blur events to apply the search prefix.
-
-        This method is triggered when the input field loses focus and applies
-        the search prefix to the current storage content.
-
-        Args:
-            event (Input.Blurred): The blur event containing the input value
-        """
-        self.apply_search_prefix(event.value)
-
     @on(FileItem.Preview)
     def on_file_item_preview(self, event: FileItem.Preview):
         """
@@ -711,5 +798,28 @@ class StorageContentContainer(Vertical):
                 self.path,
                 self.access_credentials_uuid,
                 value,
+                focus_content=True,
+            )
+        )
+
+    def action_back_to_prev_path(self):
+        """
+        Navigate back to the previous path in the storage content.
+
+        This method updates the path to the parent directory and triggers a
+        SelectStorageItem message to refresh the storage content with the new path.
+        """
+        if not self.storage:
+            return
+        if not self.path:
+            return
+        path_parents = [i for i in self.path.split("/")[:-1] if i]
+        prev_path = "/".join(path_parents)
+        self.post_message(
+            SelectStorageItem(
+                self.storage,
+                prev_path,
+                self.access_credentials_uuid,
+                focus_content=True,
             )
         )