rclone-api 1.1.12__tar.gz → 1.1.14__tar.gz

{rclone_api-1.1.12 → rclone_api-1.1.14}/PKG-INFO

@@ -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 → rclone_api-1.1.14}/pyproject.toml

@@ -21,7 +21,7 @@ dependencies = [
 ]
 
 # Change this with the version number bump.
-version = "1.1.12"
+version = "1.1.14"
 
 [tool.setuptools]
 package-dir = {"" = "src"}

{rclone_api-1.1.12 → rclone_api-1.1.14}/src/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-1.1.12 → rclone_api-1.1.14}/src/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-1.1.12 → rclone_api-1.1.14}/src/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 → rclone_api-1.1.14}/src/rclone_api.egg-info/PKG-INFO

@@ -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