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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rclone_api
-Version: 1.0.96
+Version: 1.0.98
 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.98}/pyproject.toml

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

{rclone_api-1.0.96 → rclone_api-1.0.98}/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.98/src/rclone_api/experimental/flags.py

@@ -0,0 +1,93 @@
+from dataclasses import dataclass, field
+
+
+@dataclass
+class CopyFlags:
+    check_first: bool = False
+    checksum: bool = False
+    ignore_existing: bool = False
+    ignore_times: bool = False
+    immutable: bool = False
+    inplace: bool = False
+    links: bool = False
+    metadata: bool = False
+
+
+@dataclass
+class SyncFlags:
+    backup_dir: str | None = None
+    delete_after: bool = False
+    delete_before: bool = False
+    delete_during: bool = False
+    ignore_errors: bool = False
+    track_renames: bool = False
+
+
+@dataclass
+class ImportantFlags:
+    dry_run: bool = False
+    interactive: bool = False
+    verbose: int = 0  # 0 = default, 1 = -v, 2 = -vv, etc.
+
+
+@dataclass
+class NetworkingFlags:
+    bwlimit: str | None = None
+    timeout: str | None = "5m0s"
+    tpslimit: float | None = None
+    user_agent: str | None = "rclone/v1.69.1"
+
+
+@dataclass
+class PerformanceFlags:
+    buffer_size: str | None = "16MiB"
+    checkers: int = 8
+    transfers: int = 4
+
+
+@dataclass
+class ConfigFlags:
+    config: str | None = None
+    ask_password: bool = True
+    auto_confirm: bool = False
+
+
+@dataclass
+class DebuggingFlags:
+    cpuprofile: str | None = None
+    memprofile: str | None = None
+
+
+@dataclass
+class FilterFlags:
+    exclude: list[str] = field(default_factory=list)
+    include: list[str] = field(default_factory=list)
+    max_age: str | None = None
+    min_size: str | None = None
+
+
+@dataclass
+class ListingFlags:
+    fast_list: bool = False
+
+
+@dataclass
+class LoggingFlags:
+    log_file: str | None = None
+    log_level: str = "NOTICE"  # Options: DEBUG, INFO, NOTICE, ERROR
+    stats: str | None = "1m0s"
+    progress: bool = False
+
+
+@dataclass
+class Flags:
+    copy: CopyFlags | None = None
+    sync: SyncFlags | None = None
+    important: ImportantFlags | None = None
+    networking: NetworkingFlags | None = None
+    performance: PerformanceFlags | None = None
+    config: ConfigFlags | None = None
+    debugging: DebuggingFlags | None = None
+    filter: FilterFlags | None = None
+    listing: ListingFlags | None = None
+    logging: LoggingFlags | None = None

{rclone_api-1.0.96 → rclone_api-1.0.98}/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,32 @@ 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.98}/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.98
 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.98}/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