rclone-api 1.1.12__py2.py3-none-any.whl → 1.1.14__py2.py3-none-any.whl

rclone_api/mount.py

@@ -18,6 +18,7 @@ class Mount:
 
     mount_path: Path
     process: Process
+    read_only: bool
     _closed: bool = False
 
     def __post_init__(self):

rclone_api/rclone.py

@@ -710,6 +710,7 @@ class Rclone:
             "--vfs-disk-space-total-size",
             vfs_disk_space_total_size.as_str(),
         ]
+        other_args += ["--read-only"]
         mount_path = mount_path or Path("tmp_mnts") / random_str(12)
         src_path = Path(src)
         name = src_path.name
@@ -876,8 +877,8 @@ class Rclone:
         if other_args:
             cmd_list += other_args
         proc = self._launch_process(cmd_list)
-
-        mount: Mount = Mount(mount_path=outdir, process=proc)
+        mount_read_only = "--read-only" in cmd_list  # hint to allow fast teardown
+        mount: Mount = Mount(mount_path=outdir, process=proc, read_only=mount_read_only)
         return mount
 
     @contextmanager

rclone_api/s3/chunk_types.py

@@ -184,6 +184,9 @@ class UploadState:
     def is_done(self) -> bool:
         return self.remaining() == 0
 
+    def fingerprint(self) -> str:
+        return self.upload_info.fingerprint()
+
     def count(self) -> tuple[int, int]:  # count, num_chunks
         num_chunks = self.upload_info.total_chunks()
         count = 0
@@ -218,8 +221,31 @@ class UploadState:
 
     def save(self) -> None:
         with _SAVE_STATE_LOCK:
+
+            self._check_fingerprint_no_lock()
+
             self._save_no_lock()
 
+    def _check_fingerprint_no_lock(self) -> None:
+        if self.peristant is None:
+            raise ValueError("No path to save to")
+        s3_client = self.upload_info.s3_client
+        path = self.peristant
+        last_upload_state: UploadState | None = None
+        if path.exists():
+            try:
+                last_upload_state = UploadState.from_json(s3_client, path)
+            except Exception as e:
+                locked_print(f"Error loading state: {e}")
+                last_upload_state = None
+            # now check that the fingerprint is the same
+            if last_upload_state is not None:
+                curr_fingerprint = self.fingerprint()
+                if curr_fingerprint != last_upload_state.fingerprint():
+                    raise ValueError(
+                        f"Cannot save state, fingerprint changed from {curr_fingerprint} to {self.upload_info.fingerprint()}"
+                    )
+
     def _save_no_lock(self) -> None:
         assert self.peristant is not None, "No path to save to"
         self.peristant.write_text(self.to_json_str(), encoding="utf-8")
@@ -241,13 +267,15 @@ class UploadState:
             if p is not None:
                 count_non_none += 1
 
-        # self.count()
+        file_size_bytes = self.upload_info.file_size
         finished_count, total = self.count()
-        total_finished: SizeSuffix = SizeSuffix(
-            finished_count * self.upload_info.chunk_size
-        )
+
+        total_finished_size_bytes = finished_count * self.upload_info.chunk_size
+        if finished_count == total:
+            total_finished_size_bytes = file_size_bytes
+        total_finished: SizeSuffix = SizeSuffix(total_finished_size_bytes)
         total_remaining: SizeSuffix = SizeSuffix(
-            self.remaining() * self.upload_info.chunk_size
+            file_size_bytes - total_finished_size_bytes
         )
 
         # parts.sort(key=lambda x: x.part_number)  # Some backends need this.

{rclone_api-1.1.12.dist-info → rclone_api-1.1.14.dist-info}/METADATA

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

{rclone_api-1.1.12.dist-info → rclone_api-1.1.14.dist-info}/RECORD

@@ -11,9 +11,9 @@ rclone_api/exec.py,sha256=1ovvaMXDEfLiT7BrYZyE85u_yFhEUwUNW3jPOzqknR8,1023
 rclone_api/file.py,sha256=EP5yT2dZ0H2p7CY5n0y5k5pHhIliV25pm8KOwBklUTk,1863
 rclone_api/filelist.py,sha256=xbiusvNgaB_b_kQOZoHMJJxn6TWGtPrWd2J042BI28o,767
 rclone_api/group_files.py,sha256=H92xPW9lQnbNw5KbtZCl00bD6iRh9yRbCuxku4j_3dg,8036
-rclone_api/mount.py,sha256=Xj3BMVSDEwUbtMi8ycn5mUom-fAf-F9lJOjR_BzVllw,6073
+rclone_api/mount.py,sha256=g9YkKCGJbWvGF7gzSKtWa8pEgphuW0-e0SySxtOirH4,6093
 rclone_api/process.py,sha256=xYUgU17txkZfZdr4vtRfvD8YjvSfdrbjM7PYW1npAMI,4264
-rclone_api/rclone.py,sha256=MelTVgBhV-JQdDUMLYusEuNSOq-RyrZCcKkkkSpsRfA,39955
+rclone_api/rclone.py,sha256=lCqHJ_IznQxVQTsmAyF4cym-rkc088or-EIs4NYhbO8,40102
 rclone_api/remote.py,sha256=O9WDUFQy9f6oT1HdUbTixK2eg0xtBBm8k4Xl6aa6K00,431
 rclone_api/rpath.py,sha256=8ZA_1wxWtskwcy0I8V2VbjKDmzPkiWd8Q2JQSvh-sYE,2586
 rclone_api/scan_missing_folders.py,sha256=Kulca2Q6WZodt00ATFHkmqqInuoPvBkhTcS9703y6po,4740
@@ -28,13 +28,13 @@ rclone_api/experimental/flags_base.py,sha256=ajU_czkTcAxXYU-SlmiCfHY7aCQGHvpCLqJ
 rclone_api/s3/api.py,sha256=VstlaEnBjO2JDQuCRLdTfUGvQLbfshlXXhAzimFv4Vc,3763
 rclone_api/s3/basic_ops.py,sha256=hK3366xhVEzEcjz9Gk_8lFx6MRceAk72cax6mUrr6ko,2104
 rclone_api/s3/chunk_file.py,sha256=XPoDl7DJMJIGBMRoPO2wqwqCMT7ZrIsEkDqlbMH8jzs,3506
-rclone_api/s3/chunk_types.py,sha256=pZUKc3L418XTwET1rLm4eRo_2swKQckSqlc4XjYmhDo,9147
+rclone_api/s3/chunk_types.py,sha256=vUmaTl3hGPodriM9DW1nAsYm0kHGfNT8nPWv6ur22Jo,10370
 rclone_api/s3/chunk_uploader.py,sha256=7Qumc2emQ-SpbnTL8PBN4ElpghnFWJfozVHPhm6LrQ4,9683
 rclone_api/s3/create.py,sha256=SK3IGHZwsSkoG4Zb4NCphcVg9_f7VifDKng-tExMS2s,3088
 rclone_api/s3/types.py,sha256=yBnJ38Tjk6RlydJ-sqZ7DSfyFloy8KDYJ0mv3vlOzLE,1388
-rclone_api-1.1.12.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.1.12.dist-info/METADATA,sha256=Gs7HUdcg-9dw534zO3eyi5hCNyMXBD0Js5P1fe94mnM,4479
-rclone_api-1.1.12.dist-info/WHEEL,sha256=rF4EZyR2XVS6irmOHQIJx2SUqXLZKRMUrjsg8UwN-XQ,109
-rclone_api-1.1.12.dist-info/entry_points.txt,sha256=6eNqTRXKhVf8CpWNjXiOa_0Du9tHiW_HD2iQSXRsUg8,132
-rclone_api-1.1.12.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.1.12.dist-info/RECORD,,
+rclone_api-1.1.14.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+rclone_api-1.1.14.dist-info/METADATA,sha256=oc-3Ju-_0eikBf6sP_EOVwgcWTMwxaY1zRvbCVaz5q0,4479
+rclone_api-1.1.14.dist-info/WHEEL,sha256=rF4EZyR2XVS6irmOHQIJx2SUqXLZKRMUrjsg8UwN-XQ,109
+rclone_api-1.1.14.dist-info/entry_points.txt,sha256=6eNqTRXKhVf8CpWNjXiOa_0Du9tHiW_HD2iQSXRsUg8,132
+rclone_api-1.1.14.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
+rclone_api-1.1.14.dist-info/RECORD,,