rclone-api 1.4.4__py2.py3-none-any.whl → 1.4.6__py2.py3-none-any.whl

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/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.dist-info → rclone_api-1.4.6.dist-info}/METADATA

@@ -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.dist-info → rclone_api-1.4.6.dist-info}/RECORD

@@ -14,7 +14,7 @@ rclone_api/file_part.py,sha256=i6ByS5_sae8Eba-4imBVTxd-xKC8ExWy7NR8QGr0ors,6155
 rclone_api/file_stream.py,sha256=_W3qnwCuigqA0hzXl2q5pAxSZDRaUSwet4BkT0lpnzs,1431
 rclone_api/filelist.py,sha256=xbiusvNgaB_b_kQOZoHMJJxn6TWGtPrWd2J042BI28o,767
 rclone_api/group_files.py,sha256=H92xPW9lQnbNw5KbtZCl00bD6iRh9yRbCuxku4j_3dg,8036
-rclone_api/http_server.py,sha256=YrILbxK0Xpnpkm8l9uGEXH_AOCGPUX8Cx33jKVtu7ZM,8207
+rclone_api/http_server.py,sha256=3fPBV6l50erTe32DyeJBNmsDrn5KuujsbmEAbx13T-c,8720
 rclone_api/log.py,sha256=VZHM7pNSXip2ZLBKMP7M1u-rp_F7zoafFDuR8CPUoKI,1271
 rclone_api/mount.py,sha256=TE_VIBMW7J1UkF_6HRCt8oi_jGdMov4S51bm2OgxFAM,10045
 rclone_api/process.py,sha256=BGXJTZVT__jeaDyjN8_kRycliOhkBErMPdHO1hKRvJE,5271
@@ -32,7 +32,7 @@ rclone_api/cmd/save_to_db.py,sha256=ylvnhg_yzexM-m6Zr7XDiswvoDVSl56ELuFAdb9gqBY,
 rclone_api/db/__init__.py,sha256=OSRUdnSWUlDTOHmjdjVmxYTUNpTbtaJ5Ll9sl-PfZg0,40
 rclone_api/db/db.py,sha256=YRnYrCaXHwytQt07uEZ_mMpvPHo9-0IWcOb95fVOOfs,10086
 rclone_api/db/models.py,sha256=v7qaXUehvsDvU51uk69JI23fSIs9JFGcOa-Tv1c_wVs,1600
-rclone_api/detail/copy_file_parts.py,sha256=2XA2jLCdxkenqEVCFOo3yNrYEkziNTU_Mlsp0Ra-vkg,12291
+rclone_api/detail/copy_file_parts.py,sha256=wO0IZoZS8360dR3S3TyuPTPJOyqd-z0QpSz88-9tjio,12727
 rclone_api/detail/walk.py,sha256=-54NVE8EJcCstwDoaC_UtHm73R2HrZwVwQmsnv55xNU,3369
 rclone_api/experimental/flags.py,sha256=qCVD--fSTmzlk9hloRLr0q9elzAOFzPsvVpKM3aB1Mk,2739
 rclone_api/experimental/flags_base.py,sha256=ajU_czkTcAxXYU-SlmiCfHY7aCQGHvpCLqJ-Z8uZLk0,2102
@@ -47,9 +47,9 @@ rclone_api/s3/multipart/file_info.py,sha256=8v_07_eADo0K-Nsv7F0Ac1wcv3lkIsrR3MaR
 rclone_api/s3/multipart/finished_piece.py,sha256=TcwA58-qgKBiskfHrePoCWaSSep6Za9psZEpzrLUUhE,1199
 rclone_api/s3/multipart/upload_info.py,sha256=d6_OfzFR_vtDzCEegFfzCfWi2kUBUV4aXZzqAEVp1c4,1874
 rclone_api/s3/multipart/upload_state.py,sha256=f-Aq2NqtAaMUMhYitlICSNIxCKurWAl2gDEUVizLIqw,6019
-rclone_api-1.4.4.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.4.4.dist-info/METADATA,sha256=qUjt3zZ0FKik4AqUkdvWOGhIrShXrgFOwEsfROcVRSE,4627
-rclone_api-1.4.4.dist-info/WHEEL,sha256=rF4EZyR2XVS6irmOHQIJx2SUqXLZKRMUrjsg8UwN-XQ,109
-rclone_api-1.4.4.dist-info/entry_points.txt,sha256=fJteOlYVwgX3UbNuL9jJ0zUTuX2O79JFAeNgK7Sw7EQ,255
-rclone_api-1.4.4.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.4.4.dist-info/RECORD,,
+rclone_api-1.4.6.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+rclone_api-1.4.6.dist-info/METADATA,sha256=Wq4cALgVpPO9GCGDE6YkFfZiFwbZWglP5-uwqNWuwjQ,4627
+rclone_api-1.4.6.dist-info/WHEEL,sha256=rF4EZyR2XVS6irmOHQIJx2SUqXLZKRMUrjsg8UwN-XQ,109
+rclone_api-1.4.6.dist-info/entry_points.txt,sha256=fJteOlYVwgX3UbNuL9jJ0zUTuX2O79JFAeNgK7Sw7EQ,255
+rclone_api-1.4.6.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
+rclone_api-1.4.6.dist-info/RECORD,,