rclone-api 1.0.20__tar.gz → 1.0.22__tar.gz

{rclone_api-1.0.20 → rclone_api-1.0.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rclone_api
-Version: 1.0.20
+Version: 1.0.22
 Summary: rclone api in python
 Home-page: https://github.com/zackees/rclone-api
 Maintainer: Zachary Vorhies

{rclone_api-1.0.20 → rclone_api-1.0.22}/pyproject.toml

@@ -15,7 +15,7 @@ dependencies = [
     "python-dotenv>=1.0.0",
 ]
 # Change this with the version number bump.
-version = "1.0.20"
+version = "1.0.22"
 
 [tool.setuptools]
 package-dir = {"" = "src"}

{rclone_api-1.0.20 → rclone_api-1.0.22}/src/rclone_api/process.py

@@ -124,3 +124,14 @@ class Process:
 
     def send_signal(self, signal: int) -> None:
         return self.process.send_signal(signal)
+
+    def __str__(self) -> str:
+        state = ""
+        rtn = self.process.poll()
+        if rtn is None:
+            state = "running"
+        elif rtn != 0:
+            state = f"error: {rtn}"
+        else:
+            state = "finished ok"
+        return f"Process({self.cmd}, {state})"

{rclone_api-1.0.20 → rclone_api-1.0.22}/src/rclone_api/rclone.py

@@ -19,7 +19,7 @@ from rclone_api.file import File
 from rclone_api.process import Process
 from rclone_api.remote import Remote
 from rclone_api.rpath import RPath
-from rclone_api.util import get_rclone_exe, to_path
+from rclone_api.util import get_rclone_exe, to_path, wait_for_mount
 from rclone_api.walk import walk
 
 
@@ -291,9 +291,7 @@ class Rclone:
         if other_cmds:
             cmd_list += other_cmds
         proc = self._launch_process(cmd_list)
-        time.sleep(2)  # give it a moment to mount
-        if proc.poll() is not None:
-            raise ValueError("Mount process failed to start")
+        wait_for_mount(outdir, proc)
         return proc
 
     def mount_webdav(
@@ -330,10 +328,7 @@ class Rclone:
         if other_cmds:
             cmd_list += other_cmds
         proc = self._launch_process(cmd_list)
-        # proc = rclone_exec.launch_process(cmd_list)
-        time.sleep(2)
-        if proc.poll() is not None:
-            raise ValueError("Mount process failed to start")
+        wait_for_mount(outdir, proc)
         return proc
 
     def serve_webdav(

{rclone_api-1.0.20 → rclone_api-1.0.22}/src/rclone_api/util.py

@@ -1,6 +1,7 @@
 import os
 import shutil
 import subprocess
+import time
 from pathlib import Path
 from tempfile import TemporaryDirectory
 from typing import Any
@@ -112,3 +113,17 @@ def rclone_execute(
                 tempdir.cleanup()
             except Exception as e:
                 print(f"Error cleaning up tempdir: {e}")
+
+
+def wait_for_mount(path: Path, mount_process: Any, timeout: int = 60) -> None:
+    from rclone_api.process import Process
+
+    assert isinstance(mount_process, Process)
+    expire_time = time.time() + timeout
+    while time.time() < expire_time:
+        rtn = mount_process.poll()
+        if rtn is not None:
+            raise subprocess.CalledProcessError(rtn, mount_process.cmd)
+        if path.exists():
+            return
+    raise TimeoutError(f"Path {path} did not exist after {timeout} seconds")

{rclone_api-1.0.20 → rclone_api-1.0.22}/src/rclone_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rclone_api
-Version: 1.0.20
+Version: 1.0.22
 Summary: rclone api in python
 Home-page: https://github.com/zackees/rclone-api
 Maintainer: Zachary Vorhies