kleinkram 0.33.0.dev20241024121528__tar.gz → 0.33.0.dev20241027195827__tar.gz

{kleinkram-0.33.0.dev20241024121528 → kleinkram-0.33.0.dev20241027195827}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: kleinkram
-Version: 0.33.0.dev20241024121528
+Version: 0.33.0.dev20241027195827
 Summary: A CLI for the ETH project kleinkram
 Project-URL: Homepage, https://github.com/leggedrobotics/kleinkram
 Project-URL: Issues, https://github.com/leggedrobotics/kleinkram/issues

{kleinkram-0.33.0.dev20241024121528 → kleinkram-0.33.0.dev20241027195827}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "kleinkram"
-version = "0.33.0-dev20241024121528"
+version = "0.33.0-dev20241027195827"
 description = "A CLI for the ETH project kleinkram"
 readme = "README.md"
 requires-python = ">=3.7"

{kleinkram-0.33.0.dev20241024121528 → kleinkram-0.33.0.dev20241027195827}/src/kleinkram/mission/mission.py

@@ -1,13 +1,13 @@
 import os
-
-from botocore.utils import calculate_md5
-from typing_extensions import Annotated, Optional, List
+import re
 
 import httpx
 import requests
 import typer
 from rich.console import Console
 from rich.table import Table
+from tqdm import tqdm
+from typing_extensions import Annotated, Optional, List
 
 from kleinkram.api_client import AuthenticatedClient
 from kleinkram.error_handling import AccessDeniedException
@@ -143,15 +143,20 @@ def mission_by_uuid(
 
     if json:
         print(data)
-    else:
-        print(f"mission: {data['name']}")
-        print(f"Creator: {data['creator']['name']}")
-        print("Project: " + data["project"]["name"])
-        table = Table("Filename", "Size", "date")
-        for file in data["files"]:
-            table.add_row(file["filename"], f"{file['size']}", file["date"])
-        console = Console()
-        console.print(table)
+        return
+    print(f"mission: {data['name']}")
+    print(f"Creator: {data['creator']['name']}")
+    print("Project: " + data["project"]["name"])
+    table = Table("Filename", "Size", "date")
+
+    if "files" not in data:
+        print("No files found for mission.")
+        return
+
+    for file in data["files"]:
+        table.add_row(file["filename"], f"{file['size']}", file["date"])
+    console = Console()
+    console.print(table)
 
 
 @missionCommands.command("download")
@@ -160,6 +165,11 @@ def download(
         List[str], typer.Option(help="UUIDs of Mission to download")
     ],
     local_path: Annotated[str, typer.Option()],
+    pattern: Optional[str] = typer.Option(
+        None,
+        help="Simple pattern to match the filename against. Allowed are alphanumeric characters,"
+        " '_', '-', '.' and '*' as wildcard.",
+    ),
 ):
     """
 
@@ -171,7 +181,13 @@ def download(
     if not os.path.isdir(local_path):
         raise ValueError(f"Local path '{local_path}' is not a directory.")
     if not os.listdir(local_path) == []:
-        raise ValueError(f"Local path '{local_path}' is not empty, but must be empty.")
+
+        full_local_path = os.path.abspath(local_path)
+
+        raise ValueError(
+            f"Local path '{full_local_path}' is not empty, it contains {len(os.listdir(local_path))} files. "
+            f"The local target directory must be empty."
+        )
 
     client = AuthenticatedClient()
     for single_mission_uuid in mission_uuid:
@@ -189,20 +205,43 @@ def download(
         if len(paths) == 0:
             continue
 
+        # validate search pattern
+        if pattern:
+            if not re.match(r"^[a-zA-Z0-9_\-.*]+$", pattern):
+                raise ValueError(
+                    "Invalid pattern. Allowed are alphanumeric characters, '_', '-', '.' and '*' as wildcard."
+                )
+
+            regex = pattern.replace("*", ".*")
+            pattern = re.compile(regex)
+
+        print(f"Found {len(paths)} files in mission:")
+        paths = [
+            path for path in paths if not pattern or pattern.match(path["filename"])
+        ]
+
+        if pattern:
+            print(
+                f" » filtered to {len(paths)} files matching pattern '{pattern.pattern}'."
+            )
+
+        print(f"Start downloading {len(paths)} files to '{local_path}':\n")
         for path in paths:
 
             filename = path["filename"]
-            print(f" - {filename}")
 
             response = requests.get(path["link"], stream=True)  # Enable streaming mode
-            chunk_size = 1024 * 100  # 100 KB chunks, adjust size if needed
+            chunk_size = 1024 * 1024 * 10  # 10 MB chunks, adjust size if needed
 
             # Open the file for writing in binary mode
             with open(os.path.join(local_path, filename), "wb") as f:
-                for chunk in response.iter_content(chunk_size=chunk_size):
+                for chunk in tqdm(
+                    response.iter_content(chunk_size=chunk_size),
+                    unit="MB",
+                    desc=filename,
+                ):
                     if chunk:  # Filter out keep-alive new chunks
                         f.write(chunk)
-                print(f"   Downloaded {filename}")
 
 
 @missionCommands.command("upload")