data-sourcerer 0.7.2__tar.gz → 0.7.3__tar.gz

{data_sourcerer-0.7.2 → data_sourcerer-0.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: data-sourcerer
-Version: 0.7.2
+Version: 0.7.3
 Summary: Sourcerer is a terminal cloud storage navigator.
 Author-email: Bohdana Kuzmenko <bohdana.kuzmenko.dev@gmail.com>
 License: MIT

{data_sourcerer-0.7.2 → data_sourcerer-0.7.3}/sourcerer/__init__.py

@@ -14,4 +14,4 @@ The application is structured using a clean architecture approach with:
 
 name = "sourcerer"
 package_name = "data_sourcerer"
-__version__ = "0.7.2"
+__version__ = "0.7.3"

{data_sourcerer-0.7.2 → data_sourcerer-0.7.3}/sourcerer/domain/storage_provider/entities.py

@@ -47,6 +47,7 @@ class Folder(Struct):
     """
 
     key: str
+    parent_path: str
 
 
 class File(Struct):
@@ -65,7 +66,8 @@ class File(Struct):
     key: str
     size: int
     is_text: bool
-    date_modified: datetime | None = None
+    date_modified: datetime
+    parent_path: str
 
 
 class StorageContent(Struct):

{data_sourcerer-0.7.2 → data_sourcerer-0.7.3}/sourcerer/domain/storage_provider/services.py

@@ -140,3 +140,15 @@ class BaseStorageProviderService(ABC):
         Returns:
             int: Size of the storage item in bytes
         """
+
+    def _normalize_path(self, path: str | None) -> str:
+        if path:
+            return path.rstrip("/") + "/"
+        return ""
+
+    def _get_parent_path(self, path: str, prefix: str) -> tuple[str, int]:
+        prefix = prefix.strip("/")
+        prefix_dirs = prefix.rsplit("/", 1)[0] if "/" in prefix else ""
+        parent_path = (path + prefix_dirs).rstrip("/") + "/"
+        prefix_folders_len = len(parent_path.lstrip("/"))
+        return parent_path, prefix_folders_len

{data_sourcerer-0.7.2 → data_sourcerer-0.7.3}/sourcerer/infrastructure/storage_provider/services/azure.py

@@ -38,7 +38,7 @@ from sourcerer.infrastructure.storage_provider.exceptions import (
     UploadStorageItemsError,
 )
 from sourcerer.infrastructure.storage_provider.registry import storage_provider
-from sourcerer.infrastructure.utils import generate_uuid, is_text_file
+from sourcerer.infrastructure.utils import generate_uuid, is_text_file, join_non_empty
 from sourcerer.settings import DOWNLOAD_BLOCK_SIZE, MULTIPART_UPLOAD_BLOCK_SIZE
 
 
@@ -140,26 +140,42 @@ class AzureStorageProviderService(BaseStorageProviderService):
         try:
             containers_client = self.get_containers_client(storage)
             files = []
-
             folders = set()
+            parent_path = ""
+            prefix = prefix.strip("/")
+
             if not path:
                 folders.update([i.name for i in containers_client.list_containers()])
+
             else:
                 path_parts = path.split("/", 1)
-
                 container = path_parts[0]
-                base_path = "" if len(path_parts) == 1 else path_parts[1] + "/"
 
                 blobs_client = containers_client.get_container_client(container)
 
+                base_path = "" if len(path_parts) == 1 else path_parts[1] + "/"
+
+                prefix_dirs = prefix.rsplit("/", 1)[0] if "/" in prefix else ""
+                parent_path = join_non_empty(
+                    [
+                        container.strip("/"),
+                        base_path.strip("/"),
+                        prefix_dirs.strip("/"),
+                    ],
+                    "/",
+                )
+                parent_path = parent_path.rstrip("/") + "/"
+
                 for blob in blobs_client.walk_blobs(
                     name_starts_with=base_path + prefix, delimiter="/"
                 ):
-                    remaining_path = blob.name[len(base_path) :]
+                    remaining_path = blob.name[
+                        len(base_path) + len(prefix_dirs) :
+                    ].lstrip("/")
+
                     if "/" in remaining_path:
                         folder_name = remaining_path.split("/")[0]
-                        if folder_name not in folders:
-                            folders.add(folder_name)
+                        folders.add(folder_name)
                         continue  # skip subfolders
 
                     files.append(
@@ -169,9 +185,13 @@ class AzureStorageProviderService(BaseStorageProviderService):
                             size=blob.size,  # type: ignore
                             date_modified=blob.last_modified,  # type: ignore
                             is_text=is_text_file(blob.name),
+                            parent_path=parent_path,
                         )
                     )
-            return StorageContent(files=files, folders=[Folder(key) for key in folders])
+            return StorageContent(
+                files=files,
+                folders=[Folder(key.strip("/"), parent_path) for key in folders],
+            )
         except Exception as ex:
             raise ListStorageItemsError(str(ex)) from ex
 

{data_sourcerer-0.7.2 → data_sourcerer-0.7.3}/sourcerer/infrastructure/storage_provider/services/gcp.py

@@ -125,31 +125,35 @@ class GCPStorageProviderService(BaseStorageProviderService):
             ListStorageItemsError: If an error occurs while listing items
         """
         try:
-            files = []
-            folders = []
-            if path and not path.endswith("/"):
-                path += "/"
+            path = self._normalize_path(path)
+            parent_path, prefix_folders_len = self._get_parent_path(path, prefix)
 
             bucket = self.client.bucket(storage)
 
             blobs = bucket.list_blobs(
-                prefix=path + prefix, delimiter=PATH_DELIMITER, max_results=PAGE_SIZE
+                prefix=(path + prefix).lstrip("/"),
+                delimiter=PATH_DELIMITER,
+                max_results=PAGE_SIZE,
             )
 
-            for blob in blobs:
-                files.append(
-                    File(
-                        generate_uuid(),
-                        blob.name[len(path) :],
-                        size=blob.size,
-                        date_modified=blob.updated.date(),
-                        is_text=is_text_file(blob.name),
-                    )
+            files = [
+                File(
+                    generate_uuid(),
+                    blob.name[prefix_folders_len:],
+                    size=blob.size,
+                    date_modified=blob.updated.date(),
+                    is_text=is_text_file(blob.name),
+                    parent_path=parent_path,
                 )
+                for blob in blobs
+            ]
 
-            for folder in blobs.prefixes:
-                relative_path = folder[len(path) :]
-                folders.append(Folder(relative_path))
+            folders = [
+                Folder(
+                    key=folder[prefix_folders_len:].strip("/"), parent_path=parent_path
+                )
+                for folder in blobs.prefixes
+            ]
 
             return StorageContent(files=files, folders=folders)
 

{data_sourcerer-0.7.2 → data_sourcerer-0.7.3}/sourcerer/infrastructure/storage_provider/services/s3.py

@@ -153,12 +153,13 @@ class S3ProviderService(BaseStorageProviderService):
         Raises:
             ListStorageItemsError: If an error occurs while listing items
         """
-        if path and not path.endswith("/"):
-            path += "/"
+        path = self._normalize_path(path)
+        parent_path, prefix_folders_len = self._get_parent_path(path, prefix)
+
         try:
             result = self.client.list_objects_v2(
                 Bucket=storage,
-                Prefix=path + prefix,
+                Prefix=(path + prefix).lstrip("/"),
                 Delimiter=PATH_DELIMITER,
                 MaxKeys=PAGE_SIZE,
             )
@@ -166,20 +167,25 @@ class S3ProviderService(BaseStorageProviderService):
             raise ListStorageItemsError(str(ex)) from ex
 
         folders = [
-            Folder(i.get("Prefix").replace(path, ""))
-            for i in result.get("CommonPrefixes", [])
-            if i.get("Prefix")
+            Folder(
+                key=path.get("Prefix")[prefix_folders_len:].strip("/"),
+                parent_path=parent_path,
+            )
+            for path in result.get("CommonPrefixes", [])
+            if path.get("Prefix")
         ]
+
         files = [
             File(
-                generate_uuid(),
-                i.get("Key").replace(path, ""),
-                i.get("Size"),
-                is_text_file(i.get("Key")),
-                i.get("LastModified"),
+                uuid=generate_uuid(),
+                key=i.get("Key")[prefix_folders_len:],
+                size=i.get("Size"),
+                is_text=is_text_file(i.get("Key")),
+                date_modified=i.get("LastModified"),
+                parent_path=parent_path,
             )
             for i in result.get("Contents", [])
-            if i.get("Key").replace(path, "")
+            if i.get("Key")[prefix_folders_len:]
         ]
         return StorageContent(files=files, folders=folders)
 

{data_sourcerer-0.7.2 → data_sourcerer-0.7.3}/sourcerer/infrastructure/utils.py

@@ -218,3 +218,13 @@ def generate_unique_name() -> str:
     adjective = secrets.choice(adjectives)
     name = secrets.choice(names)
     return f"{adjective}_{name}"
+
+
+def join_non_empty(items: list, separator: str):
+    """join strings with separator skipping empty values
+
+    Args:
+        items (list): A list of strings.
+        separator(str): The separator to join strings with.
+    """
+    return separator.join([str(i) for i in items if i])

{data_sourcerer-0.7.2 → data_sourcerer-0.7.3}/sourcerer/presentation/screens/main/widgets/storage_content.py

@@ -256,13 +256,12 @@ class FolderItem(StorageContentItem):
 
     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, focus_content=True
+                self.storage,
+                self.folder.parent_path + self.folder.key,
+                self.access_credentials_uuid,
+                focus_content=True,
             )
         )