rclone-api 1.0.99__py2.py3-none-any.whl → 1.1.0__py2.py3-none-any.whl

rclone_api/s3/chunk_uploader.py

@@ -1,3 +1,4 @@
+import _thread
 import json
 import os
 import time
@@ -294,22 +295,23 @@ def file_chunker(
     chunk_size = upload_info.chunk_size
     src = Path(file_path)
     # Mounted files may take a while to appear, so keep retrying.
-    file_size = _get_file_size(src, timeout=60)
-    part_number = 1
-    done_part_numbers: set[int] = {
-        p.part_number for p in upload_state.parts if p is not None
-    }
-    num_parts = upload_info.total_chunks()
-
-    def next_part_number() -> int | None:
-        nonlocal part_number
-        while part_number in done_part_numbers:
-            part_number += 1
-        if part_number > num_parts:
-            return None
-        return part_number
 
     try:
+        file_size = _get_file_size(src, timeout=60)
+        part_number = 1
+        done_part_numbers: set[int] = {
+            p.part_number for p in upload_state.parts if p is not None
+        }
+        num_parts = upload_info.total_chunks()
+
+        def next_part_number() -> int | None:
+            nonlocal part_number
+            while part_number in done_part_numbers:
+                part_number += 1
+            if part_number > num_parts:
+                return None
+            return part_number
+
         while not should_stop():
             curr_parth_num = next_part_number()
             if curr_parth_num is None:
@@ -433,6 +435,7 @@ def upload_file_multipart(
     chunk_size: int = 16 * 1024 * 1024,  # Default chunk size is 16MB; can be overridden
     retries: int = 20,
     max_chunks_before_suspension: int | None = None,
+    abort_transfer_on_failure: bool = False,
 ) -> MultiUploadResult:
     """Upload a file to the bucket using multipart upload with customizable chunk size."""
     file_size = os.path.getsize(str(file_path))
@@ -494,7 +497,13 @@ def upload_file_multipart(
         output=filechunks,
         max_chunks=max_chunks_before_suspension,
     ) -> None:
-        file_chunker(upload_state=upload_state, output=output, max_chunks=max_chunks)
+        try:
+            file_chunker(
+                upload_state=upload_state, output=output, max_chunks=max_chunks
+            )
+        except Exception:
+            _thread.interrupt_main()
+            raise
 
     try:
         thread_chunker = Thread(target=chunker_task, daemon=True)
@@ -507,7 +516,11 @@ def upload_file_multipart(
                     break
 
                 def task(upload_info=upload_info, file_chunk=file_chunk):
-                    return handle_upload(upload_info, file_chunk)
+                    try:
+                        return handle_upload(upload_info, file_chunk)
+                    except Exception:
+                        _thread.interrupt_main()
+                        raise
 
                 fut = executor.submit(task)
 
@@ -540,7 +553,7 @@ def upload_file_multipart(
             f"Multipart upload completed: {file_path} to {bucket_name}/{object_name}"
         )
     except Exception:
-        if upload_info.upload_id:
+        if upload_info.upload_id and abort_transfer_on_failure:
             try:
                 s3_client.abort_multipart_upload(
                     Bucket=bucket_name, Key=object_name, UploadId=upload_info.upload_id

{rclone_api-1.0.99.dist-info → rclone_api-1.1.0.dist-info}/METADATA

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

{rclone_api-1.0.99.dist-info → rclone_api-1.1.0.dist-info}/RECORD

@@ -25,12 +25,12 @@ rclone_api/cmd/list_files.py,sha256=x8FHODEilwKqwdiU1jdkeJbLwOqUkUQuDWPo2u_zpf0,
 rclone_api/experimental/flags.py,sha256=AHbTaFHuyYFm3pjdvbQ100jztOXOdNuxalMr8UjXnV4,4097
 rclone_api/s3/api.py,sha256=VstlaEnBjO2JDQuCRLdTfUGvQLbfshlXXhAzimFv4Vc,3763
 rclone_api/s3/basic_ops.py,sha256=hK3366xhVEzEcjz9Gk_8lFx6MRceAk72cax6mUrr6ko,2104
-rclone_api/s3/chunk_uploader.py,sha256=IX9Rvt8cypiPC_lfWnG0O2iom4_TTtlM5JAR6-L2w-o,17919
+rclone_api/s3/chunk_uploader.py,sha256=txnNtugKcTb1UDmPbqWp3K-yLUDEkeW72nEnQnDcA8o,18336
 rclone_api/s3/create.py,sha256=SK3IGHZwsSkoG4Zb4NCphcVg9_f7VifDKng-tExMS2s,3088
 rclone_api/s3/types.py,sha256=81_3jwg6MGIxC-GxL-6zANzKO6au9C0BWvAqRyODxOM,1361
-rclone_api-1.0.99.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.0.99.dist-info/METADATA,sha256=ZFl7ZyCU8maaSGuE356UwwIZqW8aZrjrJ_BfU1r9Yts,4479
-rclone_api-1.0.99.dist-info/WHEEL,sha256=rF4EZyR2XVS6irmOHQIJx2SUqXLZKRMUrjsg8UwN-XQ,109
-rclone_api-1.0.99.dist-info/entry_points.txt,sha256=6eNqTRXKhVf8CpWNjXiOa_0Du9tHiW_HD2iQSXRsUg8,132
-rclone_api-1.0.99.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.0.99.dist-info/RECORD,,
+rclone_api-1.1.0.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+rclone_api-1.1.0.dist-info/METADATA,sha256=lWksanXlrw5bUyZxWDjFpntBvxsBWd2IBImny4OZRZs,4478
+rclone_api-1.1.0.dist-info/WHEEL,sha256=rF4EZyR2XVS6irmOHQIJx2SUqXLZKRMUrjsg8UwN-XQ,109
+rclone_api-1.1.0.dist-info/entry_points.txt,sha256=6eNqTRXKhVf8CpWNjXiOa_0Du9tHiW_HD2iQSXRsUg8,132
+rclone_api-1.1.0.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
+rclone_api-1.1.0.dist-info/RECORD,,