rclone-api 1.5.8__py3-none-any.whl → 1.5.10__py3-none-any.whl

rclone_api/mount_util.py

@@ -157,6 +157,35 @@ def wait_for_mount(
         raise last_error
 
 
+def _rmtree_ignore_mounts(path):
+    """
+    Recursively remove a directory tree while ignoring mount points.
+
+    Directories that are mount points (where os.path.ismount returns True)
+    are skipped.
+    """
+    # Iterate over directory entries without following symlinks
+    with os.scandir(path) as it:
+        for entry in it:
+            full_path = entry.path
+            if entry.is_dir(follow_symlinks=False):
+                # If it's a mount point, skip recursing into it
+                if os.path.ismount(full_path):
+                    print(f"Skipping mount point: {full_path}")
+                    continue
+                # Recursively remove subdirectories
+                _rmtree_ignore_mounts(full_path)
+            else:
+                # Remove files or symlinks
+                os.unlink(full_path)
+    # Remove the now-empty directory
+    os.rmdir(path)
+
+
+# Example usage:
+# rmtree_ignore_mounts("/path/to/directory")
+
+
 def clean_mount(mount: Mount | Path, verbose: bool = False, wait=True) -> None:
     """
     Clean up a mount path across Linux, macOS, and Windows.
@@ -209,7 +238,9 @@ def clean_mount(mount: Mount | Path, verbose: bool = False, wait=True) -> None:
         _run_command(f"mountvol {mount_path} /D", verbose)
         # If that does not work, try to remove the directory directly.
         try:
-            mount_path.rmdir()
+            _rmtree_ignore_mounts(mount_path)
+            if mount_path.exists():
+                raise OSError(f"Failed to remove mount directory {mount_path}")
             if verbose:
                 print(f"Successfully removed mount directory {mount_path}")
         except Exception:
@@ -232,16 +263,19 @@ def clean_mount(mount: Mount | Path, verbose: bool = False, wait=True) -> None:
     if still_exists:
         verbose_print(f"{mount_path} still exists after unmount attempt.")
         # Attempt to remove the directory if it is empty.
-        try:
-            # Only remove if the directory is empty.
-            if not any(mount_path.iterdir()):
+
+        # Only remove if the directory is empty.
+        if not any(mount_path.iterdir()):
+            try:
                 mount_path.rmdir()
-                if verbose:
-                    verbose_print(f"Removed empty mount directory {mount_path}")
-            else:
-                warnings.warn(f"{mount_path} is not empty; cannot remove.")
-                raise OSError(f"{mount_path} is not empty")
-        except Exception as e:
-            warnings.warn(f"Failed during cleanup of {mount_path}: {e}")
+            except Exception as e:
+                warnings.warn(f"Error removing mount {mount_path}: {e}")
+                raise
+            if verbose:
+                verbose_print(f"Removed empty mount directory {mount_path}")
+        else:
+            warnings.warn(f"{mount_path} is not empty; cannot remove.")
+            raise OSError(f"{mount_path} is not empty")
+
     else:
         verbose_print(f"{mount_path} successfully cleaned up.")

{rclone_api-1.5.8.dist-info → rclone_api-1.5.10.dist-info}/METADATA

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

{rclone_api-1.5.8.dist-info → rclone_api-1.5.10.dist-info}/RECORD

@@ -18,7 +18,7 @@ rclone_api/http_server.py,sha256=LhovQu2AI-Z7zQIWflWelCiCDLnWzisL32Rs5350kxE,885
 rclone_api/install.py,sha256=Xb1BRn8rQcSpSd4dzmvIOELP2zM2DytUeIZ6jzv738A,2893
 rclone_api/log.py,sha256=VZHM7pNSXip2ZLBKMP7M1u-rp_F7zoafFDuR8CPUoKI,1271
 rclone_api/mount.py,sha256=LZqEhuKZunbWVqmsOIqkkCotaxWJpdFRS1InXveoU5E,1428
-rclone_api/mount_util.py,sha256=WXxGOhET1dPgbQg3bYIy54OPIh5dBzIYxvd_hT6tR_k,9054
+rclone_api/mount_util.py,sha256=OCc3XDyo7jx7ZDvW4UtH0BYUd6vF9kFRUgcSTI9W7Qs,10134
 rclone_api/process.py,sha256=tGooS5NLdPuqHh7hCH8SfK44A6LGftPQCPQUNgSo0a0,5714
 rclone_api/rclone_impl.py,sha256=kr0gvOSuiwxU15rvATYZmSzpWYDiAzjZ2WNe1wqI6NM,46345
 rclone_api/remote.py,sha256=mTgMTQTwxUmbLjTpr-AGTId2ycXKI9mLX5L7PPpDIoc,520
@@ -53,9 +53,9 @@ rclone_api/s3/multipart/upload_parts_inline.py,sha256=V7syKjFyVIe4U9Ahl5XgqVTzt9
 rclone_api/s3/multipart/upload_parts_resumable.py,sha256=diJoUpVYow6No_dNgOZIYVsv43k4evb6zixqpzWJaUk,9771
 rclone_api/s3/multipart/upload_parts_server_side_merge.py,sha256=Fp2pdrs5dONQI9LkfNolgAGj1-Z2V1SsRd0r0sreuXI,18040
 rclone_api/s3/multipart/upload_state.py,sha256=f-Aq2NqtAaMUMhYitlICSNIxCKurWAl2gDEUVizLIqw,6019
-rclone_api-1.5.8.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.5.8.dist-info/METADATA,sha256=z4pWEx3Zi5PCWcSKqYPoFMMFGLfVw-_i8K-a8fTYxos,32633
-rclone_api-1.5.8.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-rclone_api-1.5.8.dist-info/entry_points.txt,sha256=fJteOlYVwgX3UbNuL9jJ0zUTuX2O79JFAeNgK7Sw7EQ,255
-rclone_api-1.5.8.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.5.8.dist-info/RECORD,,
+rclone_api-1.5.10.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+rclone_api-1.5.10.dist-info/METADATA,sha256=L_UinKq8TqZwIr24SdXgm9eNgnjHMROmAFABLamsqJw,32634
+rclone_api-1.5.10.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
+rclone_api-1.5.10.dist-info/entry_points.txt,sha256=fJteOlYVwgX3UbNuL9jJ0zUTuX2O79JFAeNgK7Sw7EQ,255
+rclone_api-1.5.10.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
+rclone_api-1.5.10.dist-info/RECORD,,