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

sourcerer/presentation/screens/about/styles.tcss

@@ -0,0 +1,32 @@
+AboutScreen {
+  align: center middle;
+  content-align: center top;
+
+  & > Container {
+    padding: 1 2 0 2;
+    margin: 0 0;
+    width: 50;
+    height: 10;
+    border: solid $border;
+
+    & > Static {
+      text-align: center;
+      text-wrap: wrap;
+    }
+
+    & > Horizontal#controls {
+      padding-top: 1;
+      align: center bottom;
+
+      & > Button {
+        color: $border;
+        border: none;
+
+        & > :focus {
+            color: $border;
+        }
+      }
+    }
+  }
+
+}

sourcerer/presentation/screens/file_system_finder/main.py

@@ -1,16 +1,13 @@
 from collections.abc import Callable
 from dataclasses import dataclass
 from pathlib import Path
-from typing import ClassVar
 
 from dependency_injector.wiring import Provide
 from textual import on
 from textual.app import ComposeResult
-from textual.binding import Binding, BindingType
 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
@@ -18,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
 
 
@@ -27,14 +25,10 @@ class FileSystemSelectionValidationRule:
     error_message: str
 
 
-class FileSystemNavigationModal(ModalScreen):
+class FileSystemNavigationModal(ExitBoundModalScreen):
     CONTAINER_ID = "file_system_view_container"
     CSS_PATH = "styles.tcss"
 
-    BINDINGS: ClassVar[list[BindingType]] = [
-        Binding("escape", "app.pop_screen", "Pop screen"),
-    ]
-
     active_path: reactive[Path] = reactive(Path())
 
     def __init__(
@@ -126,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/main/main.py

@@ -1,24 +1,32 @@
+import contextlib
 import time
 import traceback
+from collections.abc import Iterable
 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.app import App, ComposeResult, SystemCommand
 from textual.binding import Binding, BindingType
 from textual.containers import Horizontal
+from textual.css.query import NoMatches
 from textual.reactive import reactive
+from textual.screen import Screen
 from textual.widgets import Footer
 
+from sourcerer.domain.package_meta.services import BasePackageMetaService
+from sourcerer.domain.settings.entities import SettingsFields
 from sourcerer.domain.storage_provider.entities import Storage
 from sourcerer.infrastructure.access_credentials.services import CredentialsService
+from sourcerer.infrastructure.settings.services import SettingsService
 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.about.main import AboutScreen
 from sourcerer.presentation.screens.critical_error.main import CriticalErrorScreen
 from sourcerer.presentation.screens.file_system_finder.main import (
     FileSystemNavigationModal,
@@ -53,6 +61,7 @@ from sourcerer.presentation.screens.preview_content.main import PreviewContentSc
 from sourcerer.presentation.screens.provider_creds_list.main import (
     ProviderCredsListScreen,
 )
+from sourcerer.presentation.screens.settings.main import SettingsScreen
 from sourcerer.presentation.screens.storage_action_progress.main import (
     DeleteKey,
     DownloadKey,
@@ -101,7 +110,10 @@ class Sourcerer(App, ResizeContainersWatcherMixin):
     CSS_PATH = "styles.tcss"
     BINDINGS: ClassVar[list[BindingType]] = [
         Binding("ctrl+r", "registrations", "Registrations list"),
-        Binding("ctrl+s", "storages", "Storages list"),
+        Binding("ctrl+l", "storages", "Storages list"),
+        Binding("ctrl+f", "find", show=False),
+        Binding("ctrl+s", "settings", "Settings"),
+        Binding("ctrl+a", "about", "About"),
         Binding(
             KeyBindings.ARROW_LEFT.value, "focus_sidebar", "Focus sidebar", show=False
         ),
@@ -113,15 +125,24 @@ class Sourcerer(App, ResizeContainersWatcherMixin):
 
     def __init__(
         self,
+        settings_service: SettingsService = Provide[DiContainer.settings_service],
         credentials_service: CredentialsService = Provide[
             DiContainer.credentials_service
         ],
+        package_meta_service: BasePackageMetaService = Provide[
+            DiContainer.package_meta_service
+        ],
         *args,
         **kwargs,
     ):
         super().__init__(*args, **kwargs)
+        self.settings_service = settings_service
         self.credentials_service = credentials_service
-        self.storage_list_sidebar = StorageListSidebar(id="storage_list_sidebar")
+        self.package_meta_service = package_meta_service
+        self.settings = self.settings_service.load_settings()
+        self.storage_list_sidebar = StorageListSidebar(
+            self.settings.group_by_access_credentials, id="storage_list_sidebar"
+        )
         self.storage_content = StorageContentContainer(id="storage_content_container")
         self.load_percentage = 0
         self.active_resizing_rule: ResizingRule | None = None
@@ -142,16 +163,58 @@ class Sourcerer(App, ResizeContainersWatcherMixin):
     def _handle_exception(self, error: Exception) -> None:
         self.push_screen(CriticalErrorScreen(str(error), traceback.format_exc()))
 
+    def get_system_commands(self, screen: Screen) -> Iterable[SystemCommand]:
+        yield SystemCommand(
+            "Quit the application",
+            "Quit the application as soon as possible",
+            self.action_quit,
+        )
+
+        if screen.query("HelpPanel"):
+            yield SystemCommand(
+                "Hide keys and help panel",
+                "Hide the keys and widget help panel",
+                self.action_hide_help_panel,
+            )
+        else:
+            yield SystemCommand(
+                "Show keys and help panel",
+                "Show help for the focused widget and a summary of available keys",
+                self.action_show_help_panel,
+            )
+        yield SystemCommand(
+            "Save screenshot",
+            "Save an SVG 'screenshot' of the current screen",
+            self.deliver_screenshot,
+        )
+        yield SystemCommand("About", "About sourcerer", self.action_about)
+        yield SystemCommand("Settings", "Sourcerer settings", self.action_settings)
+
     def on_mount(self):
         """
         Initializes the application theme and storage list on mount.
         """
 
         self.register_theme(github_dark_theme)  # pyright: ignore [reportArgumentType]
-
-        self.theme = "github-dark"
+        if self.settings.theme in self._registered_themes:
+            self.theme = self.settings.theme
+
+        package_meta = self.package_meta_service.get_package_meta()
+        if package_meta.has_available_update:
+            self.notify(
+                f"Sourcerer {package_meta.version} "
+                f"is running while {package_meta.latest_version} is available",
+                severity="warning",
+            )
         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.
@@ -174,10 +237,53 @@ 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_settings(self):
+        """
+        Opens the settings screen.
+        This method is triggered by the key binding "ctrl+s" and allows the user
+        to modify application settings such as theme and grouping of storage items.
+        It retrieves the current settings from the settings service and pushes
+        the SettingsScreen to the application stack. A callback is set to handle
+        the settings changes when the screen is closed.
+        """
+        settings = self.settings_service.load_settings()
+        self.app.push_screen(SettingsScreen(settings), callback=self.settings_callback)
 
     def action_storages(self):
-        self.app.push_screen(StoragesListScreen(), callback=self.refresh_storages)
+        self.app.push_screen(StoragesListScreen(), callback=self.modal_screen_callback)
+
+    def action_about(self):
+        self.push_screen(AboutScreen())
+
+    def settings_callback(self, settings: dict | None):
+        default_settings = self.settings_service.load_settings()
+        if settings is None:
+            self.app.theme = default_settings.theme
+            return
+        self.app.theme = settings[SettingsFields.theme]
+        if (theme := settings.get(SettingsFields.theme)) != default_settings.theme:
+            self.settings_service.set_setting(SettingsFields.theme, theme)  # type: ignore
+
+        if (
+            group_by := settings.get(SettingsFields.group_by_access_credentials)
+        ) != default_settings.group_by_access_credentials:
+            self.settings_service.set_setting(SettingsFields.group_by_access_credentials, group_by)  # type: ignore
+            self.storage_list_sidebar.groupby_access_credentials = group_by  # type: ignore
+
+    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):
         """
@@ -187,6 +293,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)
@@ -384,6 +491,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,
             )
         )
@@ -562,7 +670,7 @@ class Sourcerer(App, ResizeContainersWatcherMixin):
                 for storage in credentials.storages
                 if storage.name not in storage_names
             ]
-            self.storage_list_sidebar.storages[credentials.uuid] = (
+            self.storage_list_sidebar.storages[(credentials.uuid, credentials.name)] = (
                 storages + registered_storages
             )
             self.storage_list_sidebar.last_update_timestamp = time.time()

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/styles.tcss

@@ -12,9 +12,18 @@ StorageContent {
   align-horizontal: center;
 
   & > Button {
+    color: $primary;
     border: solid $primary;
-    width: 10;
-    content-align-horizontal: center;
+    padding-top: 0;
+    width: 15;
+    text-align: center;
+
+    &:hover {
+        color: $text;
+    }
+    &:focus {
+        color: $text;
+    }
   }
 }
 
@@ -25,8 +34,8 @@ StorageContent {
   padding: 1 1 0 1;
 }
 
-Rule {
+ResizingRule {
   color: $background-lighten-3;
   padding: 0 0;
   margin: 0 0;
-}
+}

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

@@ -12,6 +12,7 @@ from dataclasses import dataclass
 from enum import Enum, auto
 from typing import ClassVar, Self
 
+import humanize
 from textual import events, on
 from textual.app import ComposeResult
 from textual.binding import Binding, BindingType
@@ -308,6 +309,7 @@ class FileItem(StorageContentItem):
         """Message sent when a file preview is selected."""
 
         name: str
+        size: int
 
     @dataclass
     class Unselect(Message):
@@ -333,7 +335,9 @@ class FileItem(StorageContentItem):
         yield FileMetaLabel(
             f"{FILE_ICON} {self.file.key}", classes="file_name", markup=False
         )
-        yield FileMetaLabel(f"{self.file.size}", classes="file_size", markup=False)
+        yield FileMetaLabel(
+            f"{humanize.naturalsize(self.file.size)}", classes="file_size", markup=False
+        )
         yield FileMetaLabel(
             str(self.file.date_modified), classes="file_date", markup=False
         )
@@ -360,7 +364,7 @@ class FileItem(StorageContentItem):
             preview_button = self.query_one(Button)
 
         if widget is preview_button:
-            self.post_message(self.Preview(self.file.key))
+            self.post_message(self.Preview(self.file.key, self.file.size))
             return
 
         checkbox = self.query_one(UnfocusableCheckbox)
@@ -561,6 +565,8 @@ class StorageContentContainer(Vertical):
     }
     """
 
+    search_input_id: ClassVar[str] = "search_input"
+
     def compose(self) -> ComposeResult:
         if not self.storage:
             return
@@ -584,7 +590,7 @@ class StorageContentContainer(Vertical):
             with Horizontal():
                 yield Label("Search:")
                 yield Input(
-                    id="search_input",
+                    id=self.search_input_id,
                     placeholder="input path prefix here...",
                     value=self.search_prefix,
                 )
@@ -663,6 +669,7 @@ class StorageContentContainer(Vertical):
                 self.storage,
                 self.access_credentials_uuid,
                 os.path.join(self.path, event.name) if self.path else event.name,
+                event.size,
             )
         )
 

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

@@ -32,12 +32,14 @@ from sourcerer.presentation.screens.shared.widgets.button import Button
 from sourcerer.presentation.screens.shared.widgets.spinner import Spinner
 from sourcerer.presentation.settings import KeyBindings
 
+"""Mapping of storage provider types to their display icons."""
 STORAGE_ICONS = {
     StorageProvider.S3: "🟠",
     StorageProvider.GoogleCloudStorage: "🔵",
     StorageProvider.AzureStorage: "⚪️",
 }
-"""Mapping of storage provider types to their display icons."""
+
+StorageData = namedtuple("Storage", ["access_credentials_uuid", "storage"])
 
 
 class StorageItem(Label):
@@ -140,7 +142,8 @@ class StorageListSidebar(Vertical):
     """
 
     is_loading: reactive[bool] = reactive(False, recompose=True)
-    storages: reactive[dict[str, list[Storage]]] = reactive({})
+    groupby_access_credentials: reactive[bool] = reactive(False, recompose=True)
+    storages: reactive[dict[tuple[str, str], list[Storage]]] = reactive({})
     last_update_timestamp: reactive[float] = reactive(  # ty: ignore[invalid-assignment]
         0.0, recompose=True
     )
@@ -151,12 +154,43 @@ class StorageListSidebar(Vertical):
         margin-right: 0;
         height: 100%;
         margin-bottom: 1;
-        #rule-left {
+        .rule-left {
             width: 1;
+            color: $background-lighten-3;
+        }
+
+        .storage-credentials-container {
+            margin-top: 1;
+
+            & > :first-of-type {
+                margin-top: 0;
+            }
         }
 
         ScrollVerticalContainerWithNoBindings{
             height: 95%;
+
+            & > Horizontal {
+              height: auto;
+
+              & > .storage-credentials-name {
+                    color: $secondary;
+                    padding: 0 1;
+                }
+
+              & > Rule {
+                    color: $background-lighten-3;
+              }
+
+              & > Rule.storage-credentials-rule-left {
+                    width: 1;
+                    color: $secondary;
+                }
+              & > Rule.storage-credentials-rule-right {
+                    color: $secondary;
+                }
+
+            }
         }
 
         Horizontal {
@@ -186,20 +220,18 @@ class StorageListSidebar(Vertical):
     }
     """
 
-    def compose(self) -> ComposeResult:
-        with Horizontal(id="header"):
-            if self.is_loading:
-                yield Spinner()
-            yield GradientWidget(
-                " SOURCERER" if self.is_loading else "🧙SOURCERER",
-                id="left-middle",
-                name="header_click",
-            )
+    def __init__(self, groupby_access_credentials, *args, **kwargs):
+        """Initialize the StorageListSidebar widget."""
+        super().__init__(*args, **kwargs)
+        self.groupby_access_credentials = groupby_access_credentials
 
-        StorageData = namedtuple("Storage", ["access_credentials_uuid", "storage"])
+    def render_ungrouped_storages(self) -> ComposeResult:
         storages = [
             StorageData(access_credentials_uuid, storage)
-            for access_credentials_uuid, storages in self.storages.items()
+            for (
+                access_credentials_uuid,
+                access_credentials_name,
+            ), storages in self.storages.items()
             for storage in storages
         ]
         storages = sorted(storages, key=lambda x: x.storage.storage)
@@ -207,20 +239,72 @@ class StorageListSidebar(Vertical):
             for letter, storages_group in groupby(
                 storages, key=lambda x: x.storage.storage[0]
             ):
-
                 yield Horizontal(
-                    Rule(id="rule-left"),
+                    Rule(classes="rule-left"),
                     Label(letter.upper(), classes="storage-letter"),
                     Rule(),
+                    classes="storage-letter-container",
                 )
-
                 for item in storages_group:
                     yield StorageItem(
-                        renderable=f'{STORAGE_ICONS.get(item.storage.provider, "")} {item.storage.storage}',
+                        renderable=f"{STORAGE_ICONS.get(item.storage.provider, '')} {item.storage.storage}",
                         storage_name=item.storage.storage,
                         access_credentials_uuid=item.access_credentials_uuid,
                     )
 
+    def render_grouped_by_access_credentials_storages(self) -> ComposeResult:
+        """Render storages grouped by access credentials."""
+        with ScrollVerticalContainerWithNoBindings():
+            for (
+                access_credentials_uuid,
+                access_credentials_name,
+            ), storages in self.storages.items():
+                storages = sorted(
+                    [
+                        StorageData(access_credentials_uuid, storage)
+                        for storage in storages
+                    ],
+                    key=lambda x: x.storage.storage,
+                )
+                yield Horizontal(
+                    Rule(classes="storage-credentials-rule-left"),
+                    Label(
+                        access_credentials_name.upper(),
+                        classes="storage-credentials-name",
+                    ),
+                    Rule(classes="storage-credentials-rule-right"),
+                    classes="storage-credentials-container",
+                )
+                for letter, storages_group in groupby(
+                    storages, key=lambda x: x.storage.storage[0]
+                ):
+                    yield Horizontal(
+                        Rule(classes="rule-left"),
+                        Label(letter.upper(), classes="storage-letter"),
+                        Rule(),
+                        classes="storage-letter-container",
+                    )
+                    for item in storages_group:
+                        yield StorageItem(
+                            renderable=f"{STORAGE_ICONS.get(item.storage.provider, '')} {item.storage.storage}",
+                            storage_name=item.storage.storage,
+                            access_credentials_uuid=item.access_credentials_uuid,
+                        )
+
+    def compose(self) -> ComposeResult:
+        with Horizontal(id="header"):
+            if self.is_loading:
+                yield Spinner()
+            yield GradientWidget(
+                " SOURCERER" if self.is_loading else "🧙SOURCERER",
+                id="left-middle",
+                name="header_click",
+            )
+        if self.groupby_access_credentials:
+            yield from self.render_grouped_by_access_credentials_storages()
+        else:
+            yield from self.render_ungrouped_storages()
+
     def focus(self, scroll_visible: bool = True) -> Self:
         try:
             content = self.query_one(StorageItem)