rclone-api 1.1.49__py2.py3-none-any.whl → 1.1.51__py2.py3-none-any.whl

rclone_api/mount.py

@@ -1,9 +1,12 @@
+import atexit
 import os
 import platform
 import shutil
 import subprocess
 import time
 import warnings
+import weakref
+from concurrent.futures import ThreadPoolExecutor
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Any
@@ -12,11 +15,33 @@ from rclone_api.process import Process
 
 _SYSTEM = platform.system()  # "Linux", "Darwin", "Windows", etc.
 
+_MOUNTS_FOR_GC: weakref.WeakSet = weakref.WeakSet()
+
+
+def _add_mount_for_gc(mount: "Mount") -> None:
+    # weak reference to avoid circular references
+    _MOUNTS_FOR_GC.add(mount)
+
+
+def _remove_mount_for_gc(mount: "Mount") -> None:
+    _MOUNTS_FOR_GC.discard(mount)
+
+
+def _cleanup_mounts() -> None:
+    with ThreadPoolExecutor() as executor:
+        mount: Mount
+        for mount in _MOUNTS_FOR_GC:
+            executor.submit(mount.close, wait=False)
+
+
+atexit.register(_cleanup_mounts)
+
 
 @dataclass
 class Mount:
     """Mount information."""
 
+    src: str
     mount_path: Path
     process: Process
     read_only: bool
@@ -28,15 +53,18 @@ class Mount:
         assert isinstance(self.mount_path, Path)
         assert self.process is not None
         wait_for_mount(self.mount_path, self.process)
+        _add_mount_for_gc(self)
 
     def close(self, wait=True) -> None:
         """Clean up the mount."""
         if self._closed:
             return
         self._closed = True
+        self.process.terminate()
         clean_mount(self, verbose=False, wait=wait)
         if self.cache_dir and self.cache_dir_delete_on_exit:
             _cache_dir_delete_on_exit(self.cache_dir)
+        _remove_mount_for_gc(self)
 
     def __enter__(self) -> "Mount":
         return self
@@ -47,6 +75,10 @@ class Mount:
     def __del__(self):
         self.close(wait=False)
 
+    # make this a hashable object
+    def __hash__(self):
+        return hash(self.mount_path)
+
 
 def run_command(cmd: str, verbose: bool) -> int:
     """Run a shell command and print its output if verbose is True."""

rclone_api/rclone.py

@@ -960,6 +960,7 @@ class Rclone:
         proc = self._launch_process(cmd_list, log=log)
         mount_read_only = not allow_writes
         mount: Mount = Mount(
+            src=src_str,
             mount_path=outdir,
             process=proc,
             read_only=mount_read_only,

{rclone_api-1.1.49.dist-info → rclone_api-1.1.51.dist-info}/METADATA

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

{rclone_api-1.1.49.dist-info → rclone_api-1.1.51.dist-info}/RECORD

@@ -11,9 +11,9 @@ rclone_api/exec.py,sha256=Pd7pUBd8ib5MzqvMybG2DQISPRbDRu20VjVRL2mLAVY,1076
 rclone_api/file.py,sha256=EP5yT2dZ0H2p7CY5n0y5k5pHhIliV25pm8KOwBklUTk,1863
 rclone_api/filelist.py,sha256=xbiusvNgaB_b_kQOZoHMJJxn6TWGtPrWd2J042BI28o,767
 rclone_api/group_files.py,sha256=H92xPW9lQnbNw5KbtZCl00bD6iRh9yRbCuxku4j_3dg,8036
-rclone_api/mount.py,sha256=2esqcaIm8WvLorq9PfU93FxU88Kc8K4pIDt9YPa68sM,9279
+rclone_api/mount.py,sha256=5XiFwP7tst4h8cGQstZMJ0u5VzqFQ4YehnDl2AFP11A,10057
 rclone_api/process.py,sha256=rBj_S86jC6nqCYop-jq8r9eMSteKeObxUrJMgH8LZvI,5084
-rclone_api/rclone.py,sha256=ODHPq1OKKzOUgi7QPDc1UZHZLSoG9SkxnT1MXpoggx4,43823
+rclone_api/rclone.py,sha256=ye_Qdn9dC-PVXySskjrrtPljDQZz1SnvKmGkAn7rcAI,43848
 rclone_api/remote.py,sha256=O9WDUFQy9f6oT1HdUbTixK2eg0xtBBm8k4Xl6aa6K00,431
 rclone_api/rpath.py,sha256=8ZA_1wxWtskwcy0I8V2VbjKDmzPkiWd8Q2JQSvh-sYE,2586
 rclone_api/scan_missing_folders.py,sha256=Kulca2Q6WZodt00ATFHkmqqInuoPvBkhTcS9703y6po,4740
@@ -33,9 +33,9 @@ rclone_api/s3/chunk_types.py,sha256=LbXayXY1KgVU1LkdbASD_BQ7TpVpwVnzMjtz--8LBaE,
 rclone_api/s3/create.py,sha256=wgfkapv_j904CfKuWyiBIWJVxfAx_ftemFSUV14aT68,3149
 rclone_api/s3/types.py,sha256=yBnJ38Tjk6RlydJ-sqZ7DSfyFloy8KDYJ0mv3vlOzLE,1388
 rclone_api/s3/upload_file_multipart.py,sha256=y9azNAU8QH5Ovwz33V2HZwNmJdlFjJg-jrXLZ1gtMds,10364
-rclone_api-1.1.49.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.1.49.dist-info/METADATA,sha256=KDYNGUTPBDR-v6lqFNbM5o5Sn-w4IxsJkucFDGAgptk,4537
-rclone_api-1.1.49.dist-info/WHEEL,sha256=rF4EZyR2XVS6irmOHQIJx2SUqXLZKRMUrjsg8UwN-XQ,109
-rclone_api-1.1.49.dist-info/entry_points.txt,sha256=TV8kwP3FRzYwUEr0RLC7aJh0W03SAefIJNXTJ-FdMIQ,200
-rclone_api-1.1.49.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.1.49.dist-info/RECORD,,
+rclone_api-1.1.51.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+rclone_api-1.1.51.dist-info/METADATA,sha256=4bJ5zwCZ1RpMpTjmkuPrXxgdIU3aXJqyLOuhRvnd_Cg,4537
+rclone_api-1.1.51.dist-info/WHEEL,sha256=rF4EZyR2XVS6irmOHQIJx2SUqXLZKRMUrjsg8UwN-XQ,109
+rclone_api-1.1.51.dist-info/entry_points.txt,sha256=TV8kwP3FRzYwUEr0RLC7aJh0W03SAefIJNXTJ-FdMIQ,200
+rclone_api-1.1.51.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
+rclone_api-1.1.51.dist-info/RECORD,,