rclone-api 1.4.5__tar.gz → 1.4.7__tar.gz

{rclone_api-1.4.5 → rclone_api-1.4.7}/PKG-INFO

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

{rclone_api-1.4.5 → rclone_api-1.4.7}/pyproject.toml

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

{rclone_api-1.4.5 → rclone_api-1.4.7}/src/rclone_api/detail/copy_file_parts.py

@@ -248,6 +248,36 @@ class InfoJson:
         return self.to_json_str()
 
 
+def collapse_runs(numbers: list[int]) -> list[str]:
+    if not numbers:
+        return []
+
+    runs = []
+    start = numbers[0]
+    prev = numbers[0]
+
+    for num in numbers[1:]:
+        if num == prev + 1:
+            # Continue current run
+            prev = num
+        else:
+            # End current run
+            if start == prev:
+                runs.append(str(start))
+            else:
+                runs.append(f"{start}-{prev}")
+            start = num
+            prev = num
+
+    # Append the final run
+    if start == prev:
+        runs.append(str(start))
+    else:
+        runs.append(f"{start}-{prev}")
+
+    return runs
+
+
 def copy_file_parts(
     self: RcloneImpl,
     src: str,  # src:/Bucket/path/myfile.large.zst
@@ -293,7 +323,13 @@ def copy_file_parts(
     all_numbers_already_done: set[int] = set(
         info_json.fetch_all_finished_part_numbers()
     )
-    print(f"all_numbers_already_done: {sorted(list(all_numbers_already_done))}")
+
+    first_part_number = part_infos[0].part_number
+    last_part_number = part_infos[-1].part_number
+
+    print(
+        f"all_numbers_already_done: {collapse_runs(sorted(list(all_numbers_already_done)))}"
+    )
 
     filtered_part_infos: list[PartInfo] = []
     for part_info in part_infos:
@@ -302,15 +338,16 @@ def copy_file_parts(
     part_infos = filtered_part_infos
 
     remaining_part_numbers: list[int] = [p.part_number for p in part_infos]
-    print(f"remaining_part_numbers: {remaining_part_numbers}")
+    print(f"remaining_part_numbers: {collapse_runs(remaining_part_numbers)}")
 
     if len(part_infos) == 0:
         return Exception(f"No parts to copy for {src}")
     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.5 → rclone_api-1.4.7}/src/rclone_api.egg-info/PKG-INFO

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