rclone-api 1.1.10__tar.gz → 1.1.11__tar.gz

{rclone_api-1.1.10 → rclone_api-1.1.11}/PKG-INFO

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

{rclone_api-1.1.10 → rclone_api-1.1.11}/pyproject.toml

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

{rclone_api-1.1.10 → rclone_api-1.1.11}/src/rclone_api/s3/chunk_types.py

@@ -1,3 +1,4 @@
+import hashlib
 import json
 import os
 import time
@@ -103,6 +104,19 @@ class UploadInfo:
             return
         self._total_chunks = self.total_chunks()
 
+    def fingerprint(self) -> str:
+        # hash the attributes that are used to identify the upload
+        hasher = hashlib.sha256()
+        # first is file size
+        hasher.update(str(self.file_size).encode("utf-8"))
+        # second is the file path
+        hasher.update(str(self.src_file_path).encode("utf-8"))
+        # next is chunk size
+        hasher.update(str(self.chunk_size).encode("utf-8"))
+        # next is the number of parts
+        hasher.update(str(self._total_chunks).encode("utf-8"))
+        return hasher.hexdigest()
+
     def to_json(self) -> dict:
         json_dict = {}
         for f in fields(self):

{rclone_api-1.1.10 → rclone_api-1.1.11}/src/rclone_api/s3/chunk_uploader.py

@@ -162,7 +162,25 @@ def upload_file_multipart(
         return upload_state
 
     filechunks: Queue[FileChunk | None] = Queue(10)
-    upload_state = get_upload_state() or make_new_state()
+    new_state = make_new_state()
+    loaded_state = get_upload_state()
+
+    if loaded_state is None:
+        upload_state = new_state
+    else:
+        # if the file size has changed, we cannot resume
+        if (
+            loaded_state.upload_info.fingerprint()
+            != new_state.upload_info.fingerprint()
+        ):
+            locked_print(
+                f"Cannot resume upload: file size changed, starting over for {file_path}"
+            )
+            _abort_previous_upload(loaded_state)
+            upload_state = new_state
+        else:
+            upload_state = loaded_state
+
     try:
         upload_state.update_source_file(file_path)
     except ValueError as e:

{rclone_api-1.1.10 → rclone_api-1.1.11}/src/rclone_api.egg-info/PKG-INFO

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