rclone-api 1.1.2__tar.gz → 1.1.4__tar.gz

{rclone_api-1.1.2 → rclone_api-1.1.4}/PKG-INFO

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

{rclone_api-1.1.2 → rclone_api-1.1.4}/pyproject.toml

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

{rclone_api-1.1.2 → rclone_api-1.1.4}/src/rclone_api/s3/chunk_uploader.py

@@ -127,6 +127,13 @@ class UploadState:
     lock: Lock = Lock()
     parts: list[FinishedPiece | None] = field(default_factory=list)
 
+    def update_source_file(self, src_file: Path) -> None:
+        new_file_size = os.path.getsize(src_file)
+        if new_file_size != self.upload_info.file_size:
+            raise ValueError("File size changed, cannot resume")
+        self.upload_info.src_file_path = src_file
+        self.save()
+
     def is_done(self) -> bool:
         return self.remaining() == 0
 
@@ -264,13 +271,10 @@ def _get_chunk_tmpdir() -> Path:
 def _get_file_size(file_path: Path, timeout: int = 60) -> int:
     sleep_time = timeout / 60 if timeout > 0 else 1
     start = time.time()
-    not_windows = os.name != "nt"
     while True:
         expired = time.time() - start > timeout
         try:
-            if not_windows:
-                # Force a refresh of the directory cache
-                os.system(f"ls -l {file_path.parent}")
+            time.sleep(sleep_time)
             if file_path.exists():
                 return file_path.stat().st_size
         except FileNotFoundError as e:
@@ -279,7 +283,6 @@ def _get_file_size(file_path: Path, timeout: int = 60) -> int:
                 raise
         if expired:
             raise TimeoutError(f"File {file_path} not found after {timeout} seconds")
-        time.sleep(sleep_time)
 
 
 def file_chunker(
@@ -433,6 +436,18 @@ def prepare_upload_file_multipart(
     return upload_info
 
 
+def _abort_previous_upload(upload_state: UploadState) -> None:
+    if upload_state.upload_info.upload_id:
+        try:
+            upload_state.upload_info.s3_client.abort_multipart_upload(
+                Bucket=upload_state.upload_info.bucket_name,
+                Key=upload_state.upload_info.object_name,
+                UploadId=upload_state.upload_info.upload_id,
+            )
+        except Exception as e:
+            locked_print(f"Error aborting previous upload: {e}")
+
+
 def upload_file_multipart(
     s3_client: BaseClient,
     bucket_name: str,
@@ -488,6 +503,13 @@ def upload_file_multipart(
 
     filechunks: Queue[FileChunk | None] = Queue(10)
     upload_state = get_upload_state() or make_new_state()
+    try:
+        upload_state.update_source_file(file_path)
+    except ValueError as e:
+        locked_print(f"Cannot resume upload: {e}, size changed, starting over")
+        _abort_previous_upload(upload_state)
+        upload_state = make_new_state()
+        upload_state.save()
     if upload_state.is_done():
         return MultiUploadResult.ALREADY_DONE
     finished = upload_state.finished()

{rclone_api-1.1.2 → rclone_api-1.1.4}/src/rclone_api.egg-info/PKG-INFO

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