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

sourcerer/presentation/di_container.py

@@ -13,8 +13,11 @@ from dependency_injector import containers, providers
 from sourcerer.infrastructure.access_credentials.repositories import (
     SQLAlchemyCredentialsRepository,
 )
+from sourcerer.infrastructure.access_credentials.services import CredentialsService
 from sourcerer.infrastructure.db.config import Database
 from sourcerer.infrastructure.file_system.services import FileSystemService
+from sourcerer.infrastructure.storage.repositories import SQLAlchemyStoragesRepository
+from sourcerer.infrastructure.storage.services import StoragesService
 from sourcerer.settings import APP_DIR, DB_NAME
 
 DB_URL = f"sqlite:////{APP_DIR}/{DB_NAME}"
@@ -43,4 +46,16 @@ class DiContainer(containers.DeclarativeContainer):
         SQLAlchemyCredentialsRepository, session_factory
     )
 
+    storages_repository = providers.Factory(
+        SQLAlchemyStoragesRepository, session_factory
+    )
+
+    credentials_service = providers.Factory(
+        CredentialsService, repository=credentials_repository
+    )
+    storages_service = providers.Factory(
+        StoragesService,
+        repository=storages_repository,
+    )
+
     file_system_service = providers.Factory(FileSystemService, Path.home())

sourcerer/presentation/screens/file_system_finder/main.py

@@ -5,11 +5,9 @@ from pathlib import Path
 from dependency_injector.wiring import Provide
 from textual import on
 from textual.app import ComposeResult
-from textual.binding import Binding
 from textual.containers import Container, Horizontal
 from textual.css.query import NoMatches
 from textual.reactive import reactive
-from textual.screen import ModalScreen
 from textual.widgets import Static
 
 from sourcerer.infrastructure.file_system.services import FileSystemService
@@ -17,6 +15,7 @@ from sourcerer.presentation.di_container import DiContainer
 from sourcerer.presentation.screens.file_system_finder.widgets.file_system_navigator import (
     FileSystemNavigator,
 )
+from sourcerer.presentation.screens.shared.modal_screens import ExitBoundModalScreen
 from sourcerer.presentation.screens.shared.widgets.button import Button
 
 
@@ -26,21 +25,17 @@ class FileSystemSelectionValidationRule:
     error_message: str
 
 
-class FileSystemNavigationModal(ModalScreen):
+class FileSystemNavigationModal(ExitBoundModalScreen):
     CONTAINER_ID = "file_system_view_container"
     CSS_PATH = "styles.tcss"
 
-    BINDINGS = [
-        Binding("escape", "app.pop_screen", "Pop screen"),
-    ]
-
     active_path: reactive[Path] = reactive(Path())
 
     def __init__(
         self,
         *args,
-        file_system_service: FileSystemService = Provide[
-            DiContainer.file_system_service
+        file_system_service: FileSystemService = Provide[  # type: ignore
+            DiContainer.file_system_service  # type: ignore
         ],
         validation_rules: list[FileSystemSelectionValidationRule] | None = None,
         **kwargs,
@@ -125,7 +120,7 @@ class FileSystemNavigationModal(ModalScreen):
             event (Button.Click): The event containing the button that was clicked.
         """
         if event.action == "close":
-            self.on_close()
+            self.action_cancel_screen()
         else:
             self.on_apply()
 

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

@@ -1,20 +1,26 @@
+import contextlib
 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.css.query import NoMatches
 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 +61,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 +101,29 @@ 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("ctrl+f", "find", show=False),
+        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 +155,25 @@ class Sourcerer(App, ResizeContainersWatcherMixin):
         self.theme = "github-dark"
         self.init_storages_list()
 
+    def action_find(self):
+        """
+        Focus search input.
+        """
+        with contextlib.suppress(NoMatches):
+            self.query_one(f"#{self.storage_content.search_input_id}").focus()
+
+    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.
@@ -140,7 +184,23 @@ class Sourcerer(App, ResizeContainersWatcherMixin):
         This method is typically used to allow users to add their
         cloud storage credentials, which will then be reflected in the storage
         """
-        self.app.push_screen(ProviderCredsListScreen(), callback=self.refresh_storages)
+        self.app.push_screen(
+            ProviderCredsListScreen(), callback=self.modal_screen_callback
+        )
+
+    def action_storages(self):
+        self.app.push_screen(StoragesListScreen(), callback=self.modal_screen_callback)
+
+    def modal_screen_callback(self, requires_storage_refresh: bool | None = True):
+        """
+        Callback for modal screens to refresh the storage list if required.
+
+        This method is called when a modal screen is closed. If the
+        `requires_storage_refresh` flag is set to True, it refreshes the
+        storage list by calling the `refresh_storages` method.
+        """
+        if requires_storage_refresh:
+            self.refresh_storages()
 
     def refresh_storages(self, *args, **kwargs):
         """
@@ -150,6 +210,7 @@ class Sourcerer(App, ResizeContainersWatcherMixin):
         configurations.
         """
         self.storage_list_sidebar.storages = {}
+        self.storage_list_sidebar.last_update_timestamp = time.time()
         self.init_storages_list()
 
     @work(thread=True)
@@ -206,7 +267,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)
@@ -343,6 +408,7 @@ class Sourcerer(App, ResizeContainersWatcherMixin):
             PreviewContentScreen(
                 storage_name=event.storage_name,
                 key=event.path,
+                file_size=event.size,
                 access_credentials_uuid=event.access_credentials_uuid,
             )
         )
@@ -381,7 +447,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 +478,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 +493,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 +581,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/preview_request.py

@@ -8,3 +8,4 @@ class PreviewRequest(Message):
     storage_name: str
     access_credentials_uuid: str
     path: str
+    size: int

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)