rclone-api 1.5.65__py3-none-any.whl → 1.5.67__py3-none-any.whl

rclone_api/__init__.py

@@ -48,7 +48,7 @@ from .types import (  # Common types
 setup_default_logging()
 
 
-def rclone_verbose(val: bool | None) -> bool:
+def rclone_verbose(val: bool | None, from_api: bool = False) -> bool:
     """
     Get or set the global verbosity setting for rclone operations.
 
@@ -61,21 +61,43 @@ def rclone_verbose(val: bool | None) -> bool:
     Returns:
         The current verbosity setting after any change.
     """
+    import warnings
+
     from rclone_api.rclone_impl import rclone_verbose as _rclone_verbose
 
+    if not from_api:
+        warnings.warn(
+            "rclone_verbose is deprecated. Use LogSettings.rclone_verbose instead.",
+            DeprecationWarning,
+        )
+
     return _rclone_verbose(val)
 
 
-class Logging:
+class LogSettings:
     @staticmethod
-    def enable_upload_parts_logging(value: bool) -> None:
+    def enable_upload_parts_logging(value: bool | None = None) -> bool:
         """
         Enable or disable logging of upload parts.
 
         Args:
             value: If True, enables upload parts logging; otherwise disables it.
         """
-        os.environ["LOG_UPLOAD_S3_RESUMABLE"] = "1" if value else "0"
+
+        if value is not None:
+            os.environ["LOG_UPLOAD_S3_RESUMABLE"] = "1" if value else "0"
+        env_val = str(os.getenv("LOG_UPLOAD_S3_RESUMABLE", "0"))
+        return env_val.lower() in ["1", "true", "yes"]
+
+    @staticmethod
+    def rclone_verbose(value: bool) -> bool:
+        """
+        Enable or disable verbose logging for rclone commands.
+
+        Args:
+            value: If True, enables verbose logging; otherwise disables it.
+        """
+        return rclone_verbose(value, from_api=True)
 
 
 class Rclone:

rclone_api/s3/multipart/upload_parts_resumable.py

@@ -20,7 +20,7 @@ from rclone_api.types import (
 _LOCK = threading.Lock()
 
 
-def _maybe_log(msg: str) -> None:
+def _log(msg: str) -> None:
     print(msg)
     if os.getenv("LOG_UPLOAD_S3_RESUMABLE") == "1":
         log_path = Path("log") / "s3_resumable_upload.log"
@@ -32,6 +32,17 @@ def _maybe_log(msg: str) -> None:
                 f.write("\n")
 
 
+def _log_completed_item(msg: str) -> None:
+    if os.getenv("LOG_UPLOAD_S3_RESUMABLE") == "1":
+        log_path = Path("log") / "s3_resumable_upload_completed.log"
+        with _LOCK:
+            log_path.parent.mkdir(parents=True, exist_ok=True)
+            # log_path.write_text(msg, append=True)
+            with open(log_path, mode="a", encoding="utf-8") as f:
+                f.write(msg)
+                f.write("\n")
+
+
 @dataclass
 class UploadPart:
     chunk: Path
@@ -74,7 +85,7 @@ def upload_task(self: RcloneImpl, upload_part: UploadPart) -> UploadPart:
         msg += f"# Chunk size: {upload_part.chunk.stat().st_size} bytes\n"
         msg += f"# Range: {upload_part.chunk.name}\n"
         msg += "##############################################################\n"
-        _maybe_log(msg)
+        _log(msg)
         self.copy_to(upload_part.chunk.as_posix(), upload_part.dst_part)
         return upload_part
     except Exception as e:
@@ -346,7 +357,7 @@ def upload_parts_resumable(
 
     if len(exceptions) > 0:
         msg = f"Failed to copy parts: {exceptions}"
-        _maybe_log(msg)
+        _log(msg)
         return Exception(msg, exceptions)
 
     finished_parts: list[int] = info_json.fetch_all_finished_part_numbers()
@@ -355,7 +366,15 @@ def upload_parts_resumable(
     diff_set = set(all_part_numbers).symmetric_difference(set(finished_parts))
     all_part_numbers_done = len(diff_set) == 0
     # print(f"all_part_numbers_done: {all_part_numbers_done}")
-    msg = f"all_part_numbers_done: {all_part_numbers_done}"
-    _maybe_log(msg)
+    # msg = f"all_part_numbers_done: {all_part_numbers_done}"
+    full_path = os.path.join(dst_dir, src_name)
+    if all_part_numbers_done:
+        msg = f"Upload completed: {full_path} ({len(finished_parts)}/{len(all_part_numbers)})"
+        _log(msg)
+        info_json.save()
+    else:
+        msg = f"Upload failed for {full_path} ({len(finished_parts)}/{len(all_part_numbers)})"
+    _log(msg)
+    _log_completed_item(msg)
 
     return None

{rclone_api-1.5.65.dist-info → rclone_api-1.5.67.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rclone_api
-Version: 1.5.65
+Version: 1.5.67
 Summary: rclone api in python
 Home-page: https://github.com/zackees/rclone-api
 License: BSD 3-Clause License

{rclone_api-1.5.65.dist-info → rclone_api-1.5.67.dist-info}/RECORD

@@ -1,4 +1,4 @@
-rclone_api/__init__.py,sha256=AH0_iCsWfPCphaXgN0eV7zeZ5WvinUYpyizwPIuUqmQ,35244
+rclone_api/__init__.py,sha256=TLQhluXlEYEcOz0HlDtgrEs1EE15f34k6NHpW3-_dBY,35950
 rclone_api/cli.py,sha256=dibfAZIh0kXWsBbfp3onKLjyZXo54mTzDjUdzJlDlWo,231
 rclone_api/completed_process.py,sha256=_IZ8IWK7DM1_tsbDEkH6wPZ-bbcrgf7A7smls854pmg,1775
 rclone_api/config.py,sha256=URZwMME01f0EZymprCESuZ5dk4IuUSKbHhwIeTHrn7A,6131
@@ -55,12 +55,12 @@ rclone_api/s3/multipart/info_json.py,sha256=-e8UCwrqjAP64U8PmH-o2ciJ6TN48DwHktJf
 rclone_api/s3/multipart/merge_state.py,sha256=ziTB9CYV-OWaky5C1fOT9hifSY2zgUrk5HmX1Xeu2UA,4978
 rclone_api/s3/multipart/upload_info.py,sha256=d6_OfzFR_vtDzCEegFfzCfWi2kUBUV4aXZzqAEVp1c4,1874
 rclone_api/s3/multipart/upload_parts_inline.py,sha256=V7syKjFyVIe4U9Ahl5XgqVTzt9akiew3MFjGmufLo2w,12503
-rclone_api/s3/multipart/upload_parts_resumable.py,sha256=Th6m3owHS6Z-ieNhhDtU0_A6nDgKMo9y_Qv6e7lRia8,11634
+rclone_api/s3/multipart/upload_parts_resumable.py,sha256=tdOkEfoK9zENaTfgVyTWB5GNqn-IYl-zJn-rJLcoVTo,12388
 rclone_api/s3/multipart/upload_parts_server_side_merge.py,sha256=Fp2pdrs5dONQI9LkfNolgAGj1-Z2V1SsRd0r0sreuXI,18040
 rclone_api/s3/multipart/upload_state.py,sha256=f-Aq2NqtAaMUMhYitlICSNIxCKurWAl2gDEUVizLIqw,6019
-rclone_api-1.5.65.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.5.65.dist-info/METADATA,sha256=tx0O8RMD9s9oAQYXW79wpP9HupCOuh0fb13px0uy9b0,37305
-rclone_api-1.5.65.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-rclone_api-1.5.65.dist-info/entry_points.txt,sha256=ognh2e11HTjn73_KL5MWI67pBKS2jekBi-QTiRXySXA,316
-rclone_api-1.5.65.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.5.65.dist-info/RECORD,,
+rclone_api-1.5.67.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+rclone_api-1.5.67.dist-info/METADATA,sha256=NnfySdn_QjHtynzcviDQ3y42jSCPrtH_RGQnfRLDrYU,37305
+rclone_api-1.5.67.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+rclone_api-1.5.67.dist-info/entry_points.txt,sha256=ognh2e11HTjn73_KL5MWI67pBKS2jekBi-QTiRXySXA,316
+rclone_api-1.5.67.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
+rclone_api-1.5.67.dist-info/RECORD,,