rclone-api 1.0.100__py2.py3-none-any.whl → 1.1.1__py2.py3-none-any.whl

rclone_api/s3/chunk_uploader.py

@@ -295,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:
@@ -491,16 +492,20 @@ def upload_file_multipart(
     upload_info = upload_state.upload_info
     max_workers = 8
 
+    chunker_errors: Queue[Exception] = Queue()
+
     def chunker_task(
         upload_state=upload_state,
         output=filechunks,
         max_chunks=max_chunks_before_suspension,
+        queue_errors=chunker_errors,
     ) -> None:
         try:
             file_chunker(
                 upload_state=upload_state, output=output, max_chunks=max_chunks
             )
-        except Exception:
+        except Exception as e:
+            queue_errors.put(e)
             _thread.interrupt_main()
             raise
 
@@ -532,6 +537,9 @@ def upload_file_multipart(
         # upload_state.finished_parts.put(None)  # Signal the end of the queue
         upload_state.add_finished(None)
         thread_chunker.join()
+
+        if not chunker_errors.empty():
+            raise chunker_errors.get()
         if not upload_state.is_done():
             upload_state.save()
             return MultiUploadResult.SUSPENDED

{rclone_api-1.0.100.dist-info → rclone_api-1.1.1.dist-info}/METADATA

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

{rclone_api-1.0.100.dist-info → rclone_api-1.1.1.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=-GzafZ93Mm9go7BqOaq8svPsjAwtFbVuzVpFdtw8cVA,18283
+rclone_api/s3/chunk_uploader.py,sha256=JpVuCzr2Ox0bjXAyFCqQX2ctJCAId-Ttkr4E7HyWJRc,18537
 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.100.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.0.100.dist-info/METADATA,sha256=ZuM5x0cJJyMDGIi2HApzr4yqo9JdoMLCSOLyUiWkD9w,4480
-rclone_api-1.0.100.dist-info/WHEEL,sha256=rF4EZyR2XVS6irmOHQIJx2SUqXLZKRMUrjsg8UwN-XQ,109
-rclone_api-1.0.100.dist-info/entry_points.txt,sha256=6eNqTRXKhVf8CpWNjXiOa_0Du9tHiW_HD2iQSXRsUg8,132
-rclone_api-1.0.100.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.0.100.dist-info/RECORD,,
+rclone_api-1.1.1.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+rclone_api-1.1.1.dist-info/METADATA,sha256=mGHPhrp3mLNT_R8N1BjY8PTChqNViAAaaJYK8DNReHE,4478
+rclone_api-1.1.1.dist-info/WHEEL,sha256=rF4EZyR2XVS6irmOHQIJx2SUqXLZKRMUrjsg8UwN-XQ,109
+rclone_api-1.1.1.dist-info/entry_points.txt,sha256=6eNqTRXKhVf8CpWNjXiOa_0Du9tHiW_HD2iQSXRsUg8,132
+rclone_api-1.1.1.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
+rclone_api-1.1.1.dist-info/RECORD,,