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

sourcerer/presentation/screens/shared/widgets/labeled_input.py

@@ -76,5 +76,9 @@ class LabeledInput(Container):
 
         """
         input_area = self.query_one(".form_input")
-        text = input_area.document.text if isinstance(input_area, TextArea) else input_area.value  # type: ignore
+        text = (
+            input_area.document.text
+            if isinstance(input_area, TextArea)
+            else input_area.value  # type: ignore
+        )
         return self.Value(name=self.key, value=text)

sourcerer/presentation/screens/shared/widgets/loader.py

@@ -0,0 +1,31 @@
+from textual.app import ComposeResult
+from textual.containers import Container
+from textual.widgets import Static
+
+
+class Loader(Container):
+    stops = "⣷⣯⣟⡿⢿⣻⣽⣾"
+    index = 0
+
+    DEFAULT_CSS = """
+    Loader {
+        color: #9E53E0;
+    }
+    """
+
+    def __init__(self, *args, **kwargs):
+        self.label = Static(self.stops[self.index])
+        super().__init__(*args, **kwargs)
+
+    def compose(self) -> ComposeResult:
+        yield self.label
+
+    def on_mount(self) -> None:
+        self.auto_refresh = 1 / 10
+
+    def automatic_refresh(self):
+        self.index += 1
+        if self.index >= len(self.stops):
+            self.index = 0
+        value = self.stops[self.index]
+        self.label.update(value)

sourcerer/presentation/screens/storage_action_progress/main.py

@@ -1,9 +1,9 @@
 import contextlib
 import os
 from concurrent.futures import ThreadPoolExecutor, as_completed
-from dataclasses import dataclass
 from pathlib import Path
 
+from msgspec._core import Struct
 from rich.text import Text
 from textual import on
 from textual.app import ComposeResult
@@ -44,8 +44,7 @@ gradient2 = Gradient.from_colors(
 )
 
 
-@dataclass
-class Key:
+class Key(Struct):
     """
     Base class for representing a key in storage operations.
 
@@ -76,7 +75,6 @@ class DeleteKey(Key):
     """
 
 
-@dataclass
 class UploadKey(Key):
     """
     Represents a key for upload operations.
@@ -187,9 +185,9 @@ class StorageActionProgressScreen(ModalScreen):
         Sets the border title and starts the appropriate worker thread based on the action type
         (download, delete, or upload).
         """
-        self.query_one("#StorageActionProgress").border_title = (
-            f"{self.action.capitalize()} {len(self.keys)} files from {self.storage_name}"
-        )
+        self.query_one(
+            "#StorageActionProgress"
+        ).border_title = f"{self.action.capitalize()} {len(self.keys)} files from {self.storage_name}"
 
         if self.action == "download":
             self.active_worker = self.run_worker(self.download_files, thread=True)
@@ -245,7 +243,7 @@ class StorageActionProgressScreen(ModalScreen):
         This method handles the download of multiple files, updating progress bars
         and handling various error conditions that might occur during the process.
         """
-        main_progress_bar = self.query_one("#progress_bar")
+        main_progress_bar = self.query_one("#progress_bar", ProgressBar)
         failed_downloads = []
 
         with ThreadPoolExecutor(max_workers=MAX_PARALLEL_DOWNLOADS) as executor:
@@ -291,13 +289,13 @@ class StorageActionProgressScreen(ModalScreen):
         def progress_callback(progress_bar, chunk):
             progress_bar.advance(chunk)
 
-        progress_bar = self.query_one(f"#progress_bar_{uuid}")
+        progress_bar = self.query_one(f"#progress_bar_{uuid}", ProgressBar)
 
         try:
             # Step 1: Get file size
             try:
                 file_size = self.provider_service.get_file_size(self.storage_name, key)
-                progress_bar.total = file_size  # type: ignore
+                progress_bar.total = file_size
             except Exception as ex:
                 self.notify(
                     f"Failed to get file size for {key}: {str(ex)}", severity="error"
@@ -318,9 +316,9 @@ class StorageActionProgressScreen(ModalScreen):
                 return
 
             # Step 3: Ensure progress bar is complete
-            if progress_bar.progress != progress_bar.total:  # type: ignore
+            if progress_bar.progress != progress_bar.total:
                 try:
-                    progress_bar.progress = file_size  # type: ignore
+                    progress_bar.progress = file_size
                 except Exception as ex:
                     self.log.error(f"Error updating progress bar: {ex}")
                     # Non-critical error, continue execution
@@ -340,7 +338,7 @@ class StorageActionProgressScreen(ModalScreen):
         This method handles the deletion of multiple files, updating progress bars
         and handling various error conditions that might occur during the process.
         """
-        main_progress_bar = self.query_one("#progress_bar")
+        main_progress_bar = self.query_one("#progress_bar", ProgressBar)
         failed_downloads = []
 
         with ThreadPoolExecutor(max_workers=MAX_PARALLEL_DOWNLOADS) as executor:
@@ -379,11 +377,11 @@ class StorageActionProgressScreen(ModalScreen):
             main_progress_bar.advance(1)
             return
 
-        progress_bar = self.query_one(f"#progress_bar_{uuid}")
+        progress_bar = self.query_one(f"#progress_bar_{uuid}", ProgressBar)
         try:
-            progress_bar.total = 1  # type: ignore
+            progress_bar.total = 1
             self.provider_service.delete_storage_item(self.storage_name, key)
-            progress_bar.advance(1)  # type: ignore
+            progress_bar.advance(1)
         except Exception:
             self.notify(f"Failed to delete {key}", severity="error")
             raise
@@ -397,7 +395,7 @@ class StorageActionProgressScreen(ModalScreen):
         This method handles the upload of files, updating progress bars and
         handling various error conditions that might occur during the process.
         """
-        main_progress_bar = self.query_one("#progress_bar")
+        main_progress_bar = self.query_one("#progress_bar", ProgressBar)
         failed_downloads = []
         if not self.provider_service:
             self.notify("Failed to upload files", severity="error")
@@ -411,10 +409,12 @@ class StorageActionProgressScreen(ModalScreen):
                         storage=self.storage_name,
                         storage_path=self.path,
                         source_path=key.path,
-                        dest_path=key.dest_path,  # type: ignore
+                        dest_path=key.dest_path,
+                    )
+                    progress_bar = self.query_one(
+                        f"#progress_bar_{key.uuid}", ProgressBar
                     )
-                    progress_bar = self.query_one(f"#progress_bar_{key.uuid}")
-                    progress_bar.advance(1)  # type: ignore
+                    progress_bar.advance(1)
                 except UploadStorageItemsError as e:
                     self.notify(f"Failed to upload {key.path}: {e}", severity="error")
                 finally:
@@ -422,8 +422,8 @@ class StorageActionProgressScreen(ModalScreen):
             elif source_path.is_dir():
 
                 files_n = len([i for i in source_path.rglob("*") if i.is_file()])
-                progress_bar = self.query_one(f"#progress_bar_{key.uuid}")
-                progress_bar.total = files_n  # type: ignore
+                progress_bar = self.query_one(f"#progress_bar_{key.uuid}", ProgressBar)
+                progress_bar.total = files_n
                 with ThreadPoolExecutor(max_workers=MAX_PARALLEL_DOWNLOADS) as executor:
                     self.active_executor = executor
                     futures = [
@@ -447,10 +447,10 @@ class StorageActionProgressScreen(ModalScreen):
                     self.files_has_been_processed = True
                 self.active_executor = None
                 try:
-                    self.query_one(f"#progress_file_details_{key.uuid}").remove()
-                except Exception:
+                    self.query_one(f"#progress_file_details_{key.uuid}", Label).remove()
+                except NoMatches:
                     self.log(f"Failed to remove progress details for {key.uuid}")
-            main_progress_bar.advance(1)  # type: ignore
+            main_progress_bar.advance(1)
 
     def upload_file(self, source, rel_source, destination, uuid):
         """
@@ -467,12 +467,12 @@ class StorageActionProgressScreen(ModalScreen):
         if not self.provider_service:
             self.notify(f"Failed to upload {source}", severity="error")
             return
-        progress_bar = self.query_one(f"#progress_bar_{uuid}")
+        progress_bar = self.query_one(f"#progress_bar_{uuid}", ProgressBar)
         details_container = None
         with contextlib.suppress(NoMatches):
-            details_container = self.query_one(f"#progress_file_details_{uuid}")
+            details_container = self.query_one(f"#progress_file_details_{uuid}", Label)
         if details_container:
-            details_container.update(Text(f"({rel_source})", overflow="ellipsis"))  # type: ignore
+            details_container.update(Text(f"({rel_source})", overflow="ellipsis"))
         try:
             self.provider_service.upload_storage_item(
                 storage=self.storage_name,
@@ -480,7 +480,7 @@ class StorageActionProgressScreen(ModalScreen):
                 source_path=source,
                 dest_path=destination,
             )
-            progress_bar.advance(1)  # type: ignore
+            progress_bar.advance(1)
         except UploadStorageItemsError as e:
             self.notify(f"Failed to upload {source}: {e}", severity="error")
 

sourcerer/utils.py

@@ -4,7 +4,7 @@ import uuid
 from pathlib import Path
 
 
-def get_encryption_key(path: Path):
+def get_encryption_key(path: Path) -> str:
     """
     Get the encryption key from a file or generate a new one if the file doesn't exist.