rclone-bin-api 1.0.2__tar.gz → 1.0.4__tar.gz

{rclone_bin_api-1.0.2 → rclone_bin_api-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rclone-bin-api
-Version: 1.0.2
+Version: 1.0.4
 Summary: Rclone API for Python including the Rclone binaries.
 Author-email: Michael G <me@mgineer85.de>
 Maintainer-email: Michael G <me@mgineer85.de>

{rclone_bin_api-1.0.2 → rclone_bin_api-1.0.4}/pyproject.toml

@@ -2,7 +2,7 @@
 [project]
 name = "rclone-bin-api"
 description = "Rclone API for Python including the Rclone binaries."
-version = "1.0.2"
+version = "1.0.4"
 authors = [{ name = "Michael G", email = "me@mgineer85.de" }]
 maintainers = [{ name = "Michael G", email = "me@mgineer85.de" }]
 requires-python = ">=3.11"

{rclone_bin_api-1.0.2 → rclone_bin_api-1.0.4}/setup.py

@@ -11,7 +11,7 @@ from setuptools import setup
 from setuptools.command.build_py import build_py
 from wheel.bdist_wheel import bdist_wheel
 
-rclone_version = os.environ.get("RCLONE_VERSION", "1.72.1")
+rclone_version = os.environ.get("RCLONE_VERSION", "1.73.0")
 rclone_build_platform = os.environ.get("RCLONE_BUILD_PLATFORM", None)
 
 PLATFORMS = {

{rclone_bin_api-1.0.2 → rclone_bin_api-1.0.4}/src/rclone_api/api.py

@@ -24,6 +24,7 @@ class RcloneApi:
         checkers: int = 4,
         enable_webui: bool = False,
         bwlimit: str | None = None,
+        config_file: Path | None = None,
     ):
         self.__bind_addr = bind
         self.__log_file = log_file
@@ -32,6 +33,8 @@ class RcloneApi:
         self.__checkers = checkers
         self.__enable_webui = enable_webui
         self.__bwlimit = bwlimit
+        self.__config_file = config_file
+
         self.__connect_addr = f"http://{bind}"
         self.__process = None
         self.__rclone_bin = BINARY_PATH
@@ -52,6 +55,7 @@ class RcloneApi:
             [
                 str(self.__rclone_bin),
                 "rcd",
+                *([f"--config={self.__config_file}"] if self.__config_file else []),
                 f"--rc-addr={self.__bind_addr}",
                 "--rc-no-auth",  # TODO: add auth.
                 *(["--rc-web-gui"] if self.__enable_webui else []),
@@ -121,6 +125,8 @@ class RcloneApi:
         assert not (not fs.endswith(":") and not Path(fs).is_absolute()), f"fs must be absolute when remote is a local path: {fs=} {remote=}"
 
     def _post(self, endpoint: str, data: dict[str, Any] | None = None):
+        TIMEOUT = 90
+
         req = urllib.request.Request(
             url=f"{self.__connect_addr}/{endpoint}",
             data=json.dumps(data or {}).encode("utf-8"),
@@ -129,7 +135,7 @@ class RcloneApi:
         )
 
         try:
-            with urllib.request.urlopen(req, timeout=20) as resp:
+            with urllib.request.urlopen(req, timeout=TIMEOUT) as resp:
                 raw: bytes = resp.read()
                 response_json = json.loads(raw.decode("utf-8"))
 
@@ -137,6 +143,8 @@ class RcloneApi:
             raw: bytes = exc.read()
             response_json = json.loads(raw.decode("utf-8"))
             raise RcloneProcessException.from_dict(response_json) from exc
+        except TimeoutError as exc:
+            raise RcloneConnectionException(f"Operation timed out after {TIMEOUT}s. To copy large files consider using _async methods.") from exc
         except Exception as exc:  # all other errors
             raise RcloneConnectionException(f"Issue connecting to rclone RC server, error: {exc}") from exc
         else:

{rclone_bin_api-1.0.2 → rclone_bin_api-1.0.4}/src/rclone_bin_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rclone-bin-api
-Version: 1.0.2
+Version: 1.0.4
 Summary: Rclone API for Python including the Rclone binaries.
 Author-email: Michael G <me@mgineer85.de>
 Maintainer-email: Michael G <me@mgineer85.de>