rclone-api 1.0.96__tar.gz → 1.0.99__tar.gz

{rclone_api-1.0.96 → rclone_api-1.0.99}/PKG-INFO

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

{rclone_api-1.0.96 → rclone_api-1.0.99}/pyproject.toml

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

{rclone_api-1.0.96 → rclone_api-1.0.99}/src/rclone_api/cmd/copy_large_s3.py

@@ -16,6 +16,7 @@ class Args:
     read_concurrent_chunks: int
     retries: int
     save_state_json: Path
+    verbose: bool
 
 
 def list_files(rclone: Rclone, path: str):
@@ -29,6 +30,7 @@ def _parse_args() -> Args:
     parser = argparse.ArgumentParser(description="List files in a remote path.")
     parser.add_argument("src", help="File to copy")
     parser.add_argument("dst", help="Destination file")
+    parser.add_argument("-v", "--verbose", help="Verbose output", action="store_true")
     parser.add_argument(
         "--config", help="Path to rclone config file", type=Path, required=True
     )
@@ -58,6 +60,7 @@ def _parse_args() -> Args:
         read_concurrent_chunks=args.read_concurrent_chunks,
         retries=args.retries,
         save_state_json=args.resumable_json,
+        verbose=args.verbose,
     )
     return out
 
@@ -73,7 +76,7 @@ def main() -> int:
         concurrent_chunks=args.read_concurrent_chunks,
         retries=args.retries,
         save_state_json=args.save_state_json,
-        verbose=True,
+        verbose=args.verbose,
     )
     print(rslt)
     return 0

rclone_api-1.0.99/src/rclone_api/experimental/flags.py

@@ -0,0 +1,121 @@
+from dataclasses import dataclass, fields, is_dataclass
+from typing import Type, TypeVar
+
+T = TypeVar("T")
+
+
+def _merge(cls: Type[T], dataclass_a: T, dataclass_b: T) -> T:
+    if not is_dataclass(dataclass_a) or not is_dataclass(dataclass_b):
+        raise ValueError("Both inputs must be dataclass instances")
+    if type(dataclass_a) is not type(dataclass_b):
+        raise ValueError("Dataclass instances must be of the same type")
+
+    merged_kwargs = {}
+    for field in fields(dataclass_a):
+        a_value = getattr(dataclass_a, field.name)
+        b_value = getattr(dataclass_b, field.name)
+
+        if is_dataclass(a_value) and is_dataclass(b_value):
+            merged_kwargs[field.name] = _merge(type(a_value), a_value, b_value)
+        else:
+            merged_kwargs[field.name] = b_value if b_value is not None else a_value
+
+    return cls(**merged_kwargs)
+
+
+def _field_name_to_flag(field_name: str) -> str:
+    return f"--{field_name.replace('_', '-')}"
+
+
+@dataclass
+class BaseFlags:
+    def to_args(self) -> list[str]:
+        args = []
+        for field in fields(self):
+            value = getattr(self, field.name)
+            if value is None:
+                continue
+            # If the field value is a nested dataclass that supports to_args, use it.
+            if is_dataclass(value) and hasattr(value, "to_args"):
+                to_args = getattr(value, "to_args")
+                args.extend(to_args())
+            elif isinstance(value, bool):
+                # Only include the flag if the boolean is True.
+                if value:
+                    args.append(_field_name_to_flag(field.name))
+            else:
+                args.append(_field_name_to_flag(field.name))
+                if isinstance(value, list):
+                    # Join list values with a comma.
+                    args.append(",".join(map(str, value)))
+                else:
+                    args.append(str(value))
+        return args
+
+    def merge(self, other: "BaseFlags") -> "BaseFlags":
+        # Use the type of self, so merging CopyFlags returns a CopyFlags instance.
+        return _merge(type(self), self, other)
+
+    def __repr__(self):
+        return str(self.to_args())
+
+
+@dataclass(repr=False)
+class CopyFlags(BaseFlags):
+    check_first: bool | None = None
+    checksum: bool | None = False
+    compare_dest: list[str] | None = None
+    copy_dest: list[str] | None = None
+    cutoff_mode: str | None = None
+    ignore_case_sync: bool | None = None
+    ignore_checksum: bool | None = None
+    ignore_existing: bool | None = None
+    ignore_size: bool | None = None
+    ignore_times: bool | None = None
+    immutable: bool | None = None
+    inplace: bool | None = None
+    links: bool | None = None
+    max_backlog: int | None = None
+    max_duration: str | None = None
+    max_transfer: str | None = None
+    metadata: bool | None = None
+    modify_window: str | None = None
+    multi_thread_chunk_size: str | None = None
+    multi_thread_cutoff: str | None = None
+    multi_thread_streams: int | None = None
+    multi_thread_write_buffer_size: str | None = None
+    no_check_dest: bool | None = None
+    no_traverse: bool | None = None
+    no_update_dir_modtime: bool | None = None
+    no_update_modtime: bool | None = None
+    order_by: str | None = None
+    partial_suffix: str | None = None
+    refresh_times: bool | None = None
+    server_side_across_configs: bool | None = None
+    size_only: bool | None = None
+    streaming_upload_cutoff: str | None = None
+    update: bool | None = None
+
+
+@dataclass(repr=False)
+class Flags(BaseFlags):
+    copy: CopyFlags | None = None
+
+
+def unit_test() -> None:
+    copy_flags_a = CopyFlags(compare_dest=["a", "b"])
+    copy_flags_b = CopyFlags(checksum=False)
+    flags_a = copy_flags_a.merge(copy_flags_b)
+    print("A:", flags_a)
+
+    copy_flags_c = CopyFlags(checksum=True)
+    copy_flags_d = CopyFlags(checksum=False)
+
+    merged_c_d = copy_flags_c.merge(copy_flags_d)
+    print("B:", merged_c_d)
+    merged_d_c = copy_flags_d.merge(copy_flags_c)
+    print("C:", merged_d_c)
+
+
+if __name__ == "__main__":
+    unit_test()

{rclone_api-1.0.96 → rclone_api-1.0.99}/src/rclone_api/rclone.py

@@ -893,6 +893,7 @@ class Rclone:
     ) -> Generator[Process, None, None]:
         """Like mount, but can be used in a context manager."""
         error_happened = False
+        verbose = get_verbose(verbose)
         proc = self.mount(
             src,
             outdir,
@@ -918,19 +919,33 @@ class Rclone:
                 if outdir.exists():
                     print(f"{outdir} mount still exists, attempting to remove")
                     if not _IS_WINDOWS:
-                        # attempt
-                        os.system(f"fusermount -u {outdir}")
-                        os.system(f"umount {outdir}")
+
+                        def exec(cmd: str) -> int:
+                            if verbose:
+                                print(f"Executing: {cmd}")
+                            rtn = os.system(cmd)
+                            if rtn != 0 and verbose:
+                                print(f"Failed to execute: {cmd}")
+                            return rtn
+
+                        exec(f"fusermount -u {outdir}")
+                        exec(f"umount {outdir}")
                         time.sleep(2)
                         if outdir.exists():
-                            is_empty = not list(outdir.iterdir())
-                            if not is_empty:
-                                warnings.warn(f"Failed to unmount {outdir}")
-                            else:
-                                try:
-                                    outdir.rmdir()
-                                except Exception as e:
-                                    warnings.warn(f"Failed to remove {outdir}: {e}")
+                            is_empty = True
+                            try:
+                                is_empty = not list(outdir.iterdir())
+                                if not is_empty:
+                                    warnings.warn(f"Failed to unmount {outdir}")
+                                else:
+                                    try:
+                                        outdir.rmdir()
+                                    except Exception as e:
+                                        warnings.warn(f"Failed to remove {outdir}: {e}")
+                            except Exception as e:
+                                warnings.warn(
+                                    f"Failed during mount cleanup of {outdir}: because {e}"
+                                )
 
     @deprecated("mount")
     def mount_webdav(

{rclone_api-1.0.96 → rclone_api-1.0.99}/src/rclone_api/s3/chunk_uploader.py

@@ -260,6 +260,20 @@ def _get_chunk_tmpdir() -> Path:
         return out
 
 
+def _get_file_size(file_path: Path, timeout: int = 60) -> int:
+    sleep_time = timeout / 60 if timeout > 0 else 1
+    start = time.time()
+    while True:
+        try:
+            if file_path.exists():
+                return file_path.stat().st_size
+        except FileNotFoundError:
+            pass
+        if time.time() - start > timeout:
+            raise TimeoutError(f"File {file_path} not found after {timeout} seconds")
+        time.sleep(sleep_time)
+
+
 def file_chunker(
     upload_state: UploadState, max_chunks: int | None, output: Queue[FileChunk | None]
 ) -> None:
@@ -279,7 +293,8 @@ def file_chunker(
     file_path = upload_info.src_file_path
     chunk_size = upload_info.chunk_size
     src = Path(file_path)
-    file_size = os.path.getsize(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

{rclone_api-1.0.96 → rclone_api-1.0.99}/src/rclone_api.egg-info/PKG-INFO

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

{rclone_api-1.0.96 → rclone_api-1.0.99}/src/rclone_api.egg-info/SOURCES.txt

@@ -50,6 +50,7 @@ src/rclone_api.egg-info/top_level.txt
 src/rclone_api/assets/example.txt
 src/rclone_api/cmd/copy_large_s3.py
 src/rclone_api/cmd/list_files.py
+src/rclone_api/experimental/flags.py
 src/rclone_api/s3/api.py
 src/rclone_api/s3/basic_ops.py
 src/rclone_api/s3/chunk_uploader.py