remotivelabs-cli 0.0.30__tar.gz → 0.0.31__tar.gz

{remotivelabs_cli-0.0.30 → remotivelabs_cli-0.0.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: remotivelabs-cli
-Version: 0.0.30
+Version: 0.0.31
 Summary: CLI for operating RemotiveCloud and RemotiveBroker
 Author: Johan Rask
 Author-email: johan.rask@remotivelabs.com

{remotivelabs_cli-0.0.30 → remotivelabs_cli-0.0.31}/cli/cloud/filestorage.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import json
 import os.path
 import sys
 from pathlib import Path
@@ -75,6 +76,7 @@ def delete_file(
 def copy_file(  # noqa: C901 # type: ignore[too-many-branches]  # pylint: disable=no-member
     source: str = typer.Argument(default=..., help="Remote or local path to source file"),
     dest: str = typer.Argument(default=..., help="Remote or local path to destination file"),
+    overwrite: bool = typer.Option(default=False, help="Overwrite existing file on RCS"),
     project: str = typer.Option(..., help="Project ID", envvar="REMOTIVE_CLOUD_PROJECT"),
 ) -> None:
     """
@@ -100,20 +102,17 @@ def copy_file(  # noqa: C901 # type: ignore[too-many-branches]  # pylint: disabl
     else:
         path = Path(source)
         if path.is_dir():
-            print("is dir")
             for file_path in path.rglob("*"):
                 if file_path.is_file():
-                    print(file_path)
-                    __copy_to_remote(source=source, dest=dest, project=project)
+                    __copy_to_remote(source=source, dest=dest, project=project, overwrite=overwrite)
             sys.exit(1)
         else:
-            __copy_to_remote(source=source, dest=dest, project=project)
+            __copy_to_remote(source=source, dest=dest, project=project, overwrite=overwrite)
 
 
-def __copy_to_remote(source: str, dest: str, project: str) -> None:
+def __copy_to_remote(source: str, dest: str, project: str, overwrite: bool) -> None:
     path = Path(source)
     if path.is_dir():
-        print("is dir")
         sys.exit(1)
 
     if not path.exists():
@@ -123,7 +122,8 @@ def __copy_to_remote(source: str, dest: str, project: str) -> None:
     rcs_path = __check_rcs_path(dest)
     if rcs_path.endswith("/"):
         rcs_path = rcs_path + filename
-    res = Rest.handle_post(f"/api/project/{project}/files/storage{rcs_path}", return_response=True)
+    upload_options = {"overwrite": "always" if overwrite else "never"}
+    res = Rest.handle_post(f"/api/project/{project}/files/storage{rcs_path}", return_response=True, body=json.dumps(upload_options))
     if res is None:
         return
     json_res = res.json()

{remotivelabs_cli-0.0.30 → remotivelabs_cli-0.0.31}/cli/cloud/resumable_upload.py

@@ -76,10 +76,12 @@ def upload_signed_url(signed_url: str, source_file_name: str, headers: Dict[str,
     :param source_file_name:
     :return:
     """
-    with open(source_file_name, "rb") as f:
-        response = requests.put(signed_url, headers=headers, timeout=60, data=f)
-        if response.status_code not in (200, 201, 308):
-            ErrorPrinter.print_generic_error(f"Failed to upload file: {response.status_code} - {response.text}")
-            sys.exit(1)
+
+    with open(source_file_name, "rb") as file:
+        with wrap_file(file, os.stat(source_file_name).st_size, description=f"Uploading {source_file_name}...") as f:
+            response = requests.put(signed_url, headers=headers, timeout=60, data=f)
+            if response.status_code not in (200, 201, 308):
+                ErrorPrinter.print_generic_error(f"Failed to upload file: {response.status_code} - {response.text}")
+                sys.exit(1)
 
     print(f"File {source_file_name} uploaded successfully.")

{remotivelabs_cli-0.0.30 → remotivelabs_cli-0.0.31}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "remotivelabs-cli"
-version = "0.0.30"
+version = "0.0.31"
 description = "CLI for operating RemotiveCloud and RemotiveBroker"
 authors = ["Johan Rask <johan.rask@remotivelabs.com>"]
 readme = "README.md"