rclone-api 1.1.44__tar.gz → 1.1.45__tar.gz

{rclone_api-1.1.44 → rclone_api-1.1.45}/PKG-INFO

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

{rclone_api-1.1.44 → rclone_api-1.1.45}/pyproject.toml

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

{rclone_api-1.1.44 → rclone_api-1.1.45}/src/rclone_api/mount.py

@@ -31,7 +31,13 @@ class Mount:
         if self._closed:
             return
         self._closed = True
-        clean_mount(self, verbose=False)
+        clean_mount(self, verbose=False, wait=wait)
+
+    def __enter__(self) -> "Mount":
+        return self
+
+    def __exit__(self, exc_type, exc_value, traceback) -> None:
+        self.close(wait=True)
 
     def __del__(self):
         self.close(wait=False)

{rclone_api-1.1.44 → rclone_api-1.1.45}/src/rclone_api/profile/mount_copy_bytes.py

@@ -3,6 +3,7 @@ Unit test file.
 """
 
 import os
+import shutil
 import time
 from dataclasses import dataclass
 from pathlib import Path
@@ -103,10 +104,11 @@ def _init() -> None:
     os.environ["RCLONE_API_VERBOSE"] = "1"
 
 
-def _run_profile(rclone: Rclone, src_file: str, transfers: int, size: int) -> None:
-    mount_log = (
-        Path("logs") / "mount" / f"mount_{SizeSuffix(size)}_threads_{transfers}.log"
-    )
+def _run_profile(
+    rclone: Rclone, src_file: str, transfers: int, size: int, log_dir: Path
+) -> None:
+
+    mount_log = log_dir / f"mount_{SizeSuffix(size)}_threads_{transfers}.log"
     print("\n\n")
     print("#" * 80)
     print(f"# Started test download of {SizeSuffix(size)} with {transfers} transfers")
@@ -177,10 +179,18 @@ def test_profile_copy_bytes() -> None:
     # sftp mount
     src_file = "src:aa_misc_data/aa_misc_data/world_lending_library_2024_11.tar.zst"
 
+    mount_root_path = Path("logs") / "mount"
+    if mount_root_path.exists():
+        shutil.rmtree(mount_root_path)
+
     for size in sizes:
         for transfers in transfer_list:
             _run_profile(
-                rclone=rclone, src_file=src_file, transfers=transfers, size=size
+                rclone=rclone,
+                src_file=src_file,
+                transfers=transfers,
+                size=size,
+                log_dir=mount_root_path,
             )
     print("done")
 

{rclone_api-1.1.44 → rclone_api-1.1.45}/src/rclone_api/rclone.py

@@ -931,6 +931,7 @@ class Rclone:
         vfs_cache_mode = vfs_cache_mode or "full"
         clean_mount(outdir, verbose=verbose)
         prepare_mount(outdir, verbose=verbose)
+        debug_fuse = log is not None
         src_str = convert_to_str(src)
         cmd_list: list[str] = ["mount", src_str, str(outdir)]
         if not allow_writes:
@@ -940,12 +941,14 @@ class Rclone:
         if vfs_cache_mode:
             cmd_list.append("--vfs-cache-mode")
             cmd_list.append(vfs_cache_mode)
+        if debug_fuse:
+            cmd_list.append("--debug-fuse")
         if verbose:
             cmd_list.append("-vvvv")
         if other_args:
             cmd_list += other_args
         proc = self._launch_process(cmd_list, log=log)
-        mount_read_only = "--read-only" in cmd_list  # hint to allow fast teardown
+        mount_read_only = not allow_writes
         mount: Mount = Mount(mount_path=outdir, process=proc, read_only=mount_read_only)
         return mount
 
@@ -963,7 +966,6 @@ class Rclone:
     ) -> Generator[Mount, None, None]:
         """Like mount, but can be used in a context manager."""
         error_happened = False
-        verbose = get_verbose(verbose)
         mount: Mount = self.mount(
             src,
             outdir,
@@ -982,7 +984,7 @@ class Rclone:
             warnings.warn(f"Error in scoped_mount: {e}\n\nStack Trace:\n{stack_trace}")
             raise
         finally:
-            if not error_happened:
+            if not error_happened or (not allow_writes):
                 mount.close()
 
     # Settings optimized for s3.

{rclone_api-1.1.44 → rclone_api-1.1.45}/src/rclone_api.egg-info/PKG-INFO

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