rclone-api 1.4.4__tar.gz → 1.4.6__tar.gz

{rclone_api-1.4.4 → rclone_api-1.4.6}/PKG-INFO

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

{rclone_api-1.4.4 → rclone_api-1.4.6}/pyproject.toml

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

{rclone_api-1.4.4 → rclone_api-1.4.6}/src/rclone_api/detail/copy_file_parts.py

@@ -9,6 +9,7 @@ from dataclasses import dataclass
 from datetime import datetime
 from pathlib import Path
 
+from rclone_api import rclone_verbose
 from rclone_api.dir_listing import DirListing
 from rclone_api.http_server import HttpServer
 from rclone_api.rclone_impl import RcloneImpl
@@ -18,6 +19,8 @@ from rclone_api.types import (
     SizeSuffix,
 )
 
+rclone_verbose(True)
+
 
 @dataclass
 class UploadPart:
@@ -46,6 +49,11 @@ def upload_task(self: RcloneImpl, upload_part: UploadPart) -> UploadPart:
     try:
         if upload_part.exception is not None:
             return upload_part
+        # print(f"Uploading {upload_part.chunk} to {upload_part.dst_part}")
+        msg = "\n#########################################\n"
+        msg += f"# Uploading {upload_part.chunk} to {upload_part.dst_part}\n"
+        msg += "#########################################\n"
+        print
         self.copy_to(upload_part.chunk.as_posix(), upload_part.dst_part)
         return upload_part
     except Exception as e:
@@ -285,6 +293,10 @@ def copy_file_parts(
     all_numbers_already_done: set[int] = set(
         info_json.fetch_all_finished_part_numbers()
     )
+
+    first_part_number = part_infos[0].part_number
+    last_part_number = part_infos[-1].part_number
+
     print(f"all_numbers_already_done: {sorted(list(all_numbers_already_done))}")
 
     filtered_part_infos: list[PartInfo] = []
@@ -301,8 +313,9 @@ def copy_file_parts(
     chunk_size = SizeSuffix(part_infos[0].range.end - part_infos[0].range.start)
 
     info_json.chunksize = chunk_size
-    info_json.first_part = part_infos[0].part_number
-    info_json.last_part = part_infos[-1].part_number
+
+    info_json.first_part = first_part_number
+    info_json.last_part = last_part_number
     info_json.save()
 
     # We are now validated

{rclone_api-1.4.4 → rclone_api-1.4.6}/src/rclone_api/http_server.py

@@ -3,6 +3,7 @@ Unit test file for testing rclone mount functionality.
 """
 
 import tempfile
+import time
 import warnings
 from concurrent.futures import Future, ThreadPoolExecutor
 from pathlib import Path
@@ -63,33 +64,46 @@ class HttpServer:
         self, path: str, dst: Path, range: Range | None = None
     ) -> Path | Exception:
         """Get bytes from the server."""
-        if not dst.parent.exists():
-            dst.parent.mkdir(parents=True, exist_ok=True)
-        headers: dict[str, str] = {}
-        if range:
-            headers.update(range.to_header())
-        url = self._get_file_url(path)
-        try:
-            with httpx.stream(
-                "GET", url, headers=headers, timeout=_TIMEOUT
-            ) as response:
-                response.raise_for_status()
-                with open(dst, "wb") as file:
-                    for chunk in response.iter_bytes(chunk_size=8192):
-                        if chunk:
-                            file.write(chunk)
-                        else:
-                            assert response.is_closed
-                # print(f"Downloaded bytes {start}-{end} to {dst}")
-                if range:
-                    print(f"Downloaded bytes {range.start}-{range.end} to {dst}")
-                else:
-                    size = dst.stat().st_size
-                    print(f"Downloaded {size} bytes to {dst}")
-                return dst
-        except Exception as e:
-            warnings.warn(f"Failed to download {url} to {dst}: {e}")
-            return e
+
+        def task() -> Path | Exception:
+
+            if not dst.parent.exists():
+                dst.parent.mkdir(parents=True, exist_ok=True)
+            headers: dict[str, str] = {}
+            if range:
+                headers.update(range.to_header())
+            url = self._get_file_url(path)
+            try:
+                with httpx.stream(
+                    "GET", url, headers=headers, timeout=_TIMEOUT
+                ) as response:
+                    response.raise_for_status()
+                    with open(dst, "wb") as file:
+                        for chunk in response.iter_bytes(chunk_size=8192):
+                            if chunk:
+                                file.write(chunk)
+                            else:
+                                assert response.is_closed
+                    # print(f"Downloaded bytes {start}-{end} to {dst}")
+                    if range:
+                        print(f"Downloaded bytes {range.start}-{range.end} to {dst}")
+                    else:
+                        size = dst.stat().st_size
+                        print(f"Downloaded {size} bytes to {dst}")
+                    return dst
+            except Exception as e:
+                warnings.warn(f"Failed to download {url} to {dst}: {e}")
+                return e
+
+        retries = 3
+        for i in _range(retries):
+            out = task()
+            if not isinstance(out, Exception):
+                return out
+            warnings.warn(f"Failed to download {path} to {dst}: {out}, retrying ({i})")
+            time.sleep(10)
+        else:
+            return Exception(f"Failed to download {path} to {dst}")
 
     def download_multi_threaded(
         self,

{rclone_api-1.4.4 → rclone_api-1.4.6}/src/rclone_api.egg-info/PKG-INFO

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