rclone-api 1.5.33__py3-none-any.whl → 1.5.35__py3-none-any.whl

rclone_api/config.py

@@ -1,120 +1,153 @@
-import os
-from dataclasses import dataclass, field
-from pathlib import Path
-from typing import Any, Dict, List
-
-
-@dataclass
-class Section:
-    name: str
-    data: Dict[str, str] = field(default_factory=dict)
-
-    def add(self, key: str, value: str) -> None:
-        self.data[key] = value
-
-    def type(self) -> str:
-        return self.data["type"]
-
-    def provider(self) -> str | None:
-        return self.data.get("provider")
-
-    def access_key_id(self) -> str:
-        if "access_key_id" in self.data:
-            return self.data["access_key_id"]
-        elif "account" in self.data:
-            return self.data["account"]
-        raise KeyError("No access key found")
-
-    def secret_access_key(self) -> str:
-        # return self.data["secret_access_key"]
-        if "secret_access_key" in self.data:
-            return self.data["secret_access_key"]
-        elif "key" in self.data:
-            return self.data["key"]
-        raise KeyError("No secret access key found")
-
-    def endpoint(self) -> str | None:
-        return self.data.get("endpoint")
-
-
-@dataclass
-class Parsed:
-    # sections: List[ParsedSection]
-    sections: dict[str, Section]
-
-    @staticmethod
-    def parse(content: str) -> "Parsed":
-        return parse_rclone_config(content)
-
-
-@dataclass
-class Config:
-    """Rclone configuration dataclass."""
-
-    text: str
-
-    def parse(self) -> Parsed:
-        return Parsed.parse(self.text)
-
-
-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"):
-    #     return Path(os.environ["RCLONE_CONFIG"])
-    # return None
-    # rclone_conf = rclone_conf or Path.cwd() / "rclone.conf"
-
-    if os.environ.get("RCLONE_CONFIG"):
-        return Path(os.environ["RCLONE_CONFIG"])
-    if (conf := Path.cwd() / "rclone.conf").exists():
-        return conf
-    if rclone is not None:
-        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
-        path: Path
-        for path in paths:
-            if path.exists():
-                return path
-    return None
-
-
-def parse_rclone_config(content: str) -> Parsed:
-    """
-    Parses an rclone configuration file and returns a list of RcloneConfigSection objects.
-
-    Each section in the file starts with a line like [section_name]
-    followed by key=value pairs.
-    """
-    sections: List[Section] = []
-    current_section: Section | None = None
-
-    lines = content.splitlines()
-    for line in lines:
-        line = line.strip()
-        # Skip empty lines and comments (assumed to start with '#' or ';')
-        if not line or line.startswith(("#", ";")):
-            continue
-        # New section header detected
-        if line.startswith("[") and line.endswith("]"):
-            section_name = line[1:-1].strip()
-            current_section = Section(name=section_name)
-            sections.append(current_section)
-        elif "=" in line and current_section is not None:
-            # Parse key and value, splitting only on the first '=' found
-            key, value = line.split("=", 1)
-            current_section.add(key.strip(), value.strip())
-
-    data: dict[str, Section] = {}
-    for section in sections:
-        data[section.name] = section
-    return Parsed(sections=data)
+import os
+from dataclasses import dataclass, field
+from pathlib import Path
+from typing import Any, Dict, List
+
+
+@dataclass
+class Section:
+    name: str
+    data: Dict[str, str] = field(default_factory=dict)
+
+    def add(self, key: str, value: str) -> None:
+        self.data[key] = value
+
+    def type(self) -> str:
+        return self.data["type"]
+
+    def provider(self) -> str | None:
+        return self.data.get("provider")
+
+    def access_key_id(self) -> str:
+        if "access_key_id" in self.data:
+            return self.data["access_key_id"]
+        elif "account" in self.data:
+            return self.data["account"]
+        raise KeyError("No access key found")
+
+    def secret_access_key(self) -> str:
+        # return self.data["secret_access_key"]
+        if "secret_access_key" in self.data:
+            return self.data["secret_access_key"]
+        elif "key" in self.data:
+            return self.data["key"]
+        raise KeyError("No secret access key found")
+
+    def endpoint(self) -> str | None:
+        return self.data.get("endpoint")
+
+
+@dataclass
+class Parsed:
+    # sections: List[ParsedSection]
+    sections: dict[str, Section]
+
+    @staticmethod
+    def parse(content: str) -> "Parsed":
+        return parse_rclone_config(content)
+
+
+@dataclass
+class Config:
+    """Rclone configuration dataclass."""
+
+    text: str
+
+    def parse(self) -> Parsed:
+        return Parsed.parse(self.text)
+
+
+def find_conf_file(rclone: Any | None = None) -> Path | None:
+    import subprocess
+
+    from rclone_api import Rclone
+    from rclone_api.rclone_impl import RcloneImpl
+
+    # if os.environ.get("RCLONE_CONFIG"):
+    #     return Path(os.environ["RCLONE_CONFIG"])
+    # return None
+    # rclone_conf = rclone_conf or Path.cwd() / "rclone.conf"
+
+    if os.environ.get("RCLONE_CONFIG"):
+        return Path(os.environ["RCLONE_CONFIG"])
+    if (conf := Path.cwd() / "rclone.conf").exists():
+        return conf
+
+    if rclone is None:
+        from rclone_api.install import rclone_download
+
+        err = rclone_download(Path("."))
+        if isinstance(err, Exception):
+            import warnings
+
+            warnings.warn(f"rclone_download failed: {err}")
+            return None
+        cmd_list: list[str] = [
+            "rclone",
+            "config",
+            "paths",
+        ]
+        subproc: subprocess.CompletedProcess = subprocess.run(
+            args=cmd_list,
+            shell=True,
+            capture_output=True,
+            text=True,
+        )
+        if subproc.returncode == 0:
+            stdout = subproc.stdout
+            for line in stdout.splitlines():
+                parts = line.split(":", 1)
+                if len(parts) == 2:
+                    _, value = parts
+                    value = value.strip()
+                    value_path = Path(value.strip())
+                    if value_path.exists():
+                        return value_path
+    else:
+        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
+        path: Path
+        for path in paths:
+            if path.exists():
+                return path
+    return None
+
+
+def parse_rclone_config(content: str) -> Parsed:
+    """
+    Parses an rclone configuration file and returns a list of RcloneConfigSection objects.
+
+    Each section in the file starts with a line like [section_name]
+    followed by key=value pairs.
+    """
+    sections: List[Section] = []
+    current_section: Section | None = None
+
+    lines = content.splitlines()
+    for line in lines:
+        line = line.strip()
+        # Skip empty lines and comments (assumed to start with '#' or ';')
+        if not line or line.startswith(("#", ";")):
+            continue
+        # New section header detected
+        if line.startswith("[") and line.endswith("]"):
+            section_name = line[1:-1].strip()
+            current_section = Section(name=section_name)
+            sections.append(current_section)
+        elif "=" in line and current_section is not None:
+            # Parse key and value, splitting only on the first '=' found
+            key, value = line.split("=", 1)
+            current_section.add(key.strip(), value.strip())
+
+    data: dict[str, Section] = {}
+    for section in sections:
+        data[section.name] = section
+    return Parsed(sections=data)

rclone_api/fs.py

@@ -103,6 +103,7 @@ class RemoteFS(FS):
         super().__init__()
         self.src = src
         self.shutdown = False
+        self.server: HttpServer | None = None
         if rclone_conf is None:
             from rclone_api.config import find_conf_file
 
@@ -111,7 +112,7 @@ class RemoteFS(FS):
                 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)
+        self.server = self.rclone.serve_http(src=src)
 
     def root(self) -> "FSPath":
         return FSPath(self, self.src)
@@ -144,6 +145,9 @@ class RemoteFS(FS):
         self.rclone.write_bytes(data, path)
 
     def exists(self, path: Path | str) -> bool:
+        from rclone_api.http_server import HttpServer
+
+        assert isinstance(self.server, HttpServer)
         path = self._to_str(path)
         dst_rel = self._to_remote_path(path)
         return self.server.exists(dst_rel)
@@ -156,17 +160,26 @@ class RemoteFS(FS):
         return None
 
     def is_dir(self, path: Path | str) -> bool:
+        from rclone_api.http_server import HttpServer
+
+        assert isinstance(self.server, HttpServer)
         path = self._to_remote_path(path)
         err = self.server.list(path)
         return isinstance(err, list)
 
     def is_file(self, path: Path | str) -> bool:
+        from rclone_api.http_server import HttpServer
+
+        assert isinstance(self.server, HttpServer)
         path = self._to_remote_path(path)
         err = self.server.list(path)
         # Make faster.
         return isinstance(err, Exception) and self.exists(path)
 
     def ls(self, path: Path | str) -> list[str]:
+        from rclone_api.http_server import HttpServer
+
+        assert isinstance(self.server, HttpServer)
         path = self._to_remote_path(path)
         err = self.server.list(path)
         if isinstance(err, Exception):
@@ -177,7 +190,7 @@ class RemoteFS(FS):
         return FSPath(self, path)
 
     def dispose(self) -> None:
-        if self.shutdown:
+        if self.shutdown or not self.server:
             return
         self.shutdown = True
         self.server.shutdown()

{rclone_api-1.5.33.dist-info → rclone_api-1.5.35.dist-info}/METADATA

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

{rclone_api-1.5.33.dist-info → rclone_api-1.5.35.dist-info}/RECORD

@@ -1,7 +1,7 @@
 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=uOf2d-T_Df-ELCA74hdBMO-DbmshuTw3gL_d4nP7bLY,3610
+rclone_api/config.py,sha256=tahrSngQIX56jutiyMdk-TVmK8lMrLJ5H5rDsdFQRtM,4743
 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=of8Wn_kjIZE39tor5GYqgKt1OJM24uahFEGDHHQUyAM,7909
+rclone_api/fs.py,sha256=eCiY6Jw8tVC1Kcfr0334Mj29BpeBNF7OtebAPLZdY-0,8386
 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.33.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.5.33.dist-info/METADATA,sha256=rDdeLpWCrkDBZNdVjE4f23KslC0YBQj6RbuUg6SDMrg,37155
-rclone_api-1.5.33.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-rclone_api-1.5.33.dist-info/entry_points.txt,sha256=fJteOlYVwgX3UbNuL9jJ0zUTuX2O79JFAeNgK7Sw7EQ,255
-rclone_api-1.5.33.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.5.33.dist-info/RECORD,,
+rclone_api-1.5.35.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+rclone_api-1.5.35.dist-info/METADATA,sha256=bb59EsCikl2fAIPakFqltagrSVQdumz2Ip7KZTgHpHA,37155
+rclone_api-1.5.35.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+rclone_api-1.5.35.dist-info/entry_points.txt,sha256=fJteOlYVwgX3UbNuL9jJ0zUTuX2O79JFAeNgK7Sw7EQ,255
+rclone_api-1.5.35.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
+rclone_api-1.5.35.dist-info/RECORD,,