rclone-api 1.0.20__py2.py3-none-any.whl → 1.0.22__py2.py3-none-any.whl

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/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/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.dist-info → rclone_api-1.0.22.dist-info}/METADATA

@@ -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.dist-info → rclone_api-1.0.22.dist-info}/RECORD

@@ -7,15 +7,15 @@ rclone_api/dir_listing.py,sha256=8t5Jx9ZVOJPqGKTJbWaES6bjgogUT2bnpbPVWwK1Fcs,112
 rclone_api/exec.py,sha256=9qSOpZo8YRYxv3hOvNr57ApnY2KbjxwT1QNr8OgcLM4,883
 rclone_api/file.py,sha256=D02iHJW1LhfOiM_R_yPHP8_ApnDiYrkuraVcrV8-qkw,1246
 rclone_api/filelist.py,sha256=xbiusvNgaB_b_kQOZoHMJJxn6TWGtPrWd2J042BI28o,767
-rclone_api/process.py,sha256=C7vdGEvIKcI4fx-Z702wK1qomzSsFpdke2SQnBHxd-Y,3660
-rclone_api/rclone.py,sha256=MyFpjzC1Dh5TJbuulraXdtVSPAS3zuERrDj5TIdam6o,12887
+rclone_api/process.py,sha256=iVA8_qtJFgHtg92Yb4W7xv9jnyds_7kAdKeSiGCBIZ0,3952
+rclone_api/rclone.py,sha256=RBlEi7M8Jpgt8oJcV-2VrhF-iVAtGlpfBJ7YXGjPS_s,12649
 rclone_api/remote.py,sha256=c9hlRKBCg1BFB9MCINaQIoCg10qyAkeqiS4brl8ce-8,343
 rclone_api/rpath.py,sha256=8ZA_1wxWtskwcy0I8V2VbjKDmzPkiWd8Q2JQSvh-sYE,2586
-rclone_api/util.py,sha256=BDRJ2MIceDoKVTjUQBwyhjbA8UwPrZ-0ZSa9xyMJd0E,3343
+rclone_api/util.py,sha256=AWTImA1liCMw52wtS-Gs8Abz96diQ39x6Tx56mvbrEo,3860
 rclone_api/walk.py,sha256=kca0t1GAnF6FLclN01G8NG__Qe-ggodLtAbQSHyVPng,2968
 rclone_api/assets/example.txt,sha256=lTBovRjiz0_TgtAtbA1C5hNi2ffbqnNPqkKg6UiKCT8,54
-rclone_api-1.0.20.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.0.20.dist-info/METADATA,sha256=XfXp7UbwmdR0PtTwH7m_w3K9ZmIPQx0VZuRI9G7Zlb8,4454
-rclone_api-1.0.20.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
-rclone_api-1.0.20.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.0.20.dist-info/RECORD,,
+rclone_api-1.0.22.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+rclone_api-1.0.22.dist-info/METADATA,sha256=dl2QJr1Q_oRiRNLB9gC-ZWAbCgHUxqUm-cdBVjPEFnI,4454
+rclone_api-1.0.22.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
+rclone_api-1.0.22.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
+rclone_api-1.0.22.dist-info/RECORD,,