rclone-api 1.5.30__py3-none-any.whl → 1.5.32__py3-none-any.whl

rclone_api/__init__.py

@@ -92,6 +92,13 @@ class Rclone:
 
         return upgrade_rclone()
 
+    @staticmethod
+    def find_rclone_conf() -> Path | None:
+        """Find the rclone configuration file from the environment or default locations."""
+        from rclone_api.config import find_conf_file
+
+        return find_conf_file()
+
     def __init__(
         self, rclone_conf: Path | Config | None, rclone_exe: Path | None = None
     ) -> None:

rclone_api/config.py

@@ -58,6 +58,7 @@ class Config:
 
 
 def find_conf_file(rclone: Any | None = None) -> Path | None:
+    from rclone_api import Rclone
     from rclone_api.rclone_impl import RcloneImpl
 
     # if os.environ.get("RCLONE_CONFIG"):
@@ -70,8 +71,13 @@ def find_conf_file(rclone: Any | None = None) -> Path | None:
     if (conf := Path.cwd() / "rclone.conf").exists():
         return conf
     if rclone is not None:
-        assert isinstance(rclone, RcloneImpl)
-        paths_or_err = rclone.config_paths()
+        if isinstance(rclone, Rclone):
+            rclone = rclone.impl
+        else:
+            assert isinstance(rclone, RcloneImpl)
+        rclone_impl: RcloneImpl = rclone
+        assert isinstance(rclone_impl, RcloneImpl)
+        paths_or_err = rclone_impl.config_paths()
         if isinstance(paths_or_err, Exception):
             return None
         paths = paths_or_err

rclone_api/fs.py

@@ -95,19 +95,19 @@ class RemoteFS(FS):
     ) -> "RemoteFS":
         if isinstance(rclone_conf, str):
             rclone_conf = Config(text=rclone_conf)
-        if rclone_conf is None:
-            curr_dir = Path.cwd() / "rclone.conf"
-            if curr_dir.exists():
-                rclone_conf = curr_dir
-            else:
-                raise ValueError("rclone_conf not found")
         return RemoteFS(rclone_conf, src)
 
-    def __init__(self, rclone_conf: Path | Config, src: str) -> None:
+    def __init__(self, rclone_conf: Path | Config | None, src: str) -> None:
         from rclone_api import HttpServer, Rclone
 
         super().__init__()
         self.src = src
+        if rclone_conf is None:
+            from rclone_api.config import find_conf_file
+
+            rclone_conf = find_conf_file()
+            if rclone_conf is None:
+                raise FileNotFoundError("rclone.conf not found")
         self.rclone_conf = rclone_conf
         self.rclone: Rclone = Rclone(rclone_conf)
         self.server: HttpServer = self.rclone.serve_http(src=src)

{rclone_api-1.5.30.dist-info → rclone_api-1.5.32.dist-info}/METADATA

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

{rclone_api-1.5.30.dist-info → rclone_api-1.5.32.dist-info}/RECORD

@@ -1,7 +1,7 @@
-rclone_api/__init__.py,sha256=yq_KcexJvedJH7A2w7bTkZB8iwTPThhLVvntxKBaeZg,33839
+rclone_api/__init__.py,sha256=KxOU2UGnoqw1EDHwugFTHHgccfhq22trGiRDwX5Dsng,34086
 rclone_api/cli.py,sha256=dibfAZIh0kXWsBbfp3onKLjyZXo54mTzDjUdzJlDlWo,231
 rclone_api/completed_process.py,sha256=_IZ8IWK7DM1_tsbDEkH6wPZ-bbcrgf7A7smls854pmg,1775
-rclone_api/config.py,sha256=fLot9LcKCsfGpMh8Cg0Hwz3NTNB6BM7L7OYhf1gcOFY,3389
+rclone_api/config.py,sha256=uOf2d-T_Df-ELCA74hdBMO-DbmshuTw3gL_d4nP7bLY,3610
 rclone_api/convert.py,sha256=Mx9Qo7zhkOedJd8LdhPvNGHp8znJzOk4f_2KWnoGc78,1012
 rclone_api/deprecated.py,sha256=qWKpnZdYcBK7YQZKuVoWWXDwi-uqiAtbjgPcci_efow,590
 rclone_api/diff.py,sha256=tMoJMAGmLSE6Q_7QhPf6PnCzb840djxMZtDmhc2GlGQ,5227
@@ -13,7 +13,7 @@ rclone_api/file_item.py,sha256=cH-AQYsxedhNPp4c8NHY1ad4Z7St4yf_VGbmiGD59no,1770
 rclone_api/file_part.py,sha256=i6ByS5_sae8Eba-4imBVTxd-xKC8ExWy7NR8QGr0ors,6155
 rclone_api/file_stream.py,sha256=_W3qnwCuigqA0hzXl2q5pAxSZDRaUSwet4BkT0lpnzs,1431
 rclone_api/filelist.py,sha256=xbiusvNgaB_b_kQOZoHMJJxn6TWGtPrWd2J042BI28o,767
-rclone_api/fs.py,sha256=T08YXyHgxyWbjK09hNAIhchLyWtA1LLU5o1rJe6zvcE,7899
+rclone_api/fs.py,sha256=h8FO_WwTyEGqcNb-ox_KSEyCyk47gu2UPkRW2X3miHs,7909
 rclone_api/group_files.py,sha256=H92xPW9lQnbNw5KbtZCl00bD6iRh9yRbCuxku4j_3dg,8036
 rclone_api/http_server.py,sha256=ZdL-rGaq0zIjcaIiRIbPBQ4OIWZ7dCu71aq0nRlKtY4,11686
 rclone_api/install.py,sha256=Xb1BRn8rQcSpSd4dzmvIOELP2zM2DytUeIZ6jzv738A,2893
@@ -54,9 +54,9 @@ rclone_api/s3/multipart/upload_parts_inline.py,sha256=V7syKjFyVIe4U9Ahl5XgqVTzt9
 rclone_api/s3/multipart/upload_parts_resumable.py,sha256=6-nlMclS8jyVvMvFbQDcZOX9MY1WbCcKA_s9bwuYxnk,9793
 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.30.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.5.30.dist-info/METADATA,sha256=-mG3FHHnONLdYf6GrDWZtXgBoRVfdqrmhG0nUPxk-GA,37155
-rclone_api-1.5.30.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-rclone_api-1.5.30.dist-info/entry_points.txt,sha256=fJteOlYVwgX3UbNuL9jJ0zUTuX2O79JFAeNgK7Sw7EQ,255
-rclone_api-1.5.30.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.5.30.dist-info/RECORD,,
+rclone_api-1.5.32.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+rclone_api-1.5.32.dist-info/METADATA,sha256=WXGjSGhkhL-1T8OTfND6vuFdssvx2iPQ9e-s9gzxtuo,37155
+rclone_api-1.5.32.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+rclone_api-1.5.32.dist-info/entry_points.txt,sha256=fJteOlYVwgX3UbNuL9jJ0zUTuX2O79JFAeNgK7Sw7EQ,255
+rclone_api-1.5.32.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
+rclone_api-1.5.32.dist-info/RECORD,,