rclone-api 1.5.59__py3-none-any.whl → 1.5.61__py3-none-any.whl

rclone_api/config.py

@@ -52,9 +52,11 @@ class Config:
     """Rclone configuration dataclass."""
 
     # text: str
-    def __init__(self, text: str | dict) -> None:
+    def __init__(self, text: str | dict | None) -> None:
         self.text: str
-        if isinstance(text, dict):
+        if text is None:
+            self.text = ""
+        elif isinstance(text, dict):
             self.text = _json_to_rclone_config_str_or_raise(text)
         else:
             self.text = text

rclone_api/exec.py

@@ -10,7 +10,7 @@ from rclone_api.process import Process, ProcessArgs
 class RcloneExec:
     """Rclone execution dataclass."""
 
-    rclone_config: Path | Config
+    rclone_config: Path | Config | None
     rclone_exe: Path
 
     def execute(

rclone_api/http_server.py

@@ -2,6 +2,7 @@
 Unit test file for testing rclone mount functionality.
 """
 
+import logging
 import tempfile
 import time
 import warnings
@@ -21,6 +22,7 @@ from rclone_api.types import Range, SizeSuffix, get_chunk_tmpdir
 _TIMEOUT = 10 * 60  # 10 minutes
 _PUT_WARNED = False
 
+logger = logging.getLogger(__name__)
 
 _range = range
 
@@ -84,7 +86,6 @@ class HttpServer:
         """Check if the file exists on the server."""
         try:
             assert self.process is not None
-            # response = httpx.head(f"{self.url}/{path}")
             url = self._get_file_url(path)
             response = httpx.head(url)
             return response.status_code == 200
@@ -96,7 +97,6 @@ class HttpServer:
         """Get size of the file from the server."""
         try:
             assert self.process is not None
-            # response = httpx.head(f"{self.url}/{path}")
             url = self._get_file_url(path)
             response = httpx.head(url)
             response.raise_for_status()
@@ -117,7 +117,7 @@ class HttpServer:
             url = self._get_file_url(path)
             headers = {"Content-Type": "application/octet-stream"}
             response = httpx.post(url, content=data, timeout=_TIMEOUT, headers=headers)
-            print("Allowed methods:", response.headers.get("Allow"))
+            logger.info(f"Allowed methods: {response.headers.get('Allow')}")
             response.raise_for_status()
             return None
         except Exception as e:
@@ -179,15 +179,14 @@ class HttpServer:
                                 file.write(chunk)
                             else:
                                 assert response.is_closed
-                    # print(f"Downloaded bytes {start}-{end} to {dst}")
                     if range:
                         length = range.end - range.start
-                        print(
+                        logger.info(
                             f"Downloaded bytes starting at {range.start} with size {length} to {dst}"
                         )
                     else:
                         size = dst.stat().st_size
-                        print(f"Downloaded {size} bytes to {dst}")
+                        logger.info(f"Downloaded {size} bytes to {dst}")
                     return dst
             except Exception as e:
                 warnings.warn(f"Failed to download {url} to {dst}: {e}")
@@ -263,7 +262,7 @@ class HttpServer:
                 count = 0
                 with open(dst_path, "wb") as file:
                     for f in finished:
-                        print(f"Appending {f} to {dst_path}")
+                        logger.info(f"Appending {f} to {dst_path}")
                         with open(f, "rb") as part:
                             # chunk = part.read(8192 * 4)
                             while chunk := part.read(8192 * 4):
@@ -271,9 +270,8 @@ class HttpServer:
                                     break
                                 count += len(chunk)
                                 file.write(chunk)
-                        print(f"Removing {f}")
+                        logger.info(f"Removing {f}")
                         f.unlink()
-                # print(f"Downloaded {count} bytes to {dst_path}")
                 return dst_path
             except Exception as e:
                 warnings.warn(f"Failed to copy chunked: {e}")

rclone_api/process.py

@@ -15,7 +15,7 @@ from rclone_api.util import clear_temp_config_file, get_verbose, make_temp_confi
 @dataclass
 class ProcessArgs:
     cmd: list[str]
-    rclone_conf: Path | Config
+    rclone_conf: Path | Config | None
     rclone_exe: Path
     cmd_list: list[str]
     verbose: bool | None = None
@@ -32,7 +32,7 @@ class Process:
         self.log = args.log
         self.cleaned_up = False
         self.tempfile: Path | None = None
-
+        rclone_conf: Path | None = None
         verbose = get_verbose(args.verbose)
         # Create a temporary config file if needed.
         if isinstance(args.rclone_conf, Config):
@@ -41,15 +41,12 @@ class Process:
             rclone_conf = self.tempfile
         else:
             rclone_conf = args.rclone_conf
-
-        assert rclone_conf.exists(), f"rclone config not found: {rclone_conf}"
-
+        # assert rclone_conf.exists(), f"rclone config not found: {rclone_conf}"
         # Build the command.
-        self.cmd = (
-            [str(args.rclone_exe.resolve())]
-            + ["--config", str(rclone_conf.resolve())]
-            + args.cmd
-        )
+        self.cmd = [str(args.rclone_exe.resolve())]
+        if rclone_conf:
+            self.cmd += ["--config", str(rclone_conf.resolve())]
+        self.cmd += args.cmd_list
         if self.args.log:
             self.args.log.parent.mkdir(parents=True, exist_ok=True)
             self.cmd += ["--log-file", str(self.args.log)]

rclone_api/rclone_impl.py

@@ -67,8 +67,10 @@ def rclone_verbose(verbose: bool | None) -> bool:
     return bool(int(os.getenv("RCLONE_API_VERBOSE", "0")))
 
 
-def _to_rclone_conf(config: Config | Path) -> Config:
-    if isinstance(config, Path):
+def _to_rclone_conf(config: Config | Path | None) -> Config:
+    if config is None:
+        return Config(None)
+    elif isinstance(config, Path):
         content = config.read_text(encoding="utf-8")
         return Config(content)
     else:
@@ -100,13 +102,17 @@ class RcloneImpl:
         if isinstance(rclone_conf, Path):
             if not rclone_conf.exists():
                 raise ValueError(f"Rclone config file not found: {rclone_conf}")
+        rclone_exe = get_rclone_exe(rclone_exe)
+        # Not fully constructed version of ._exec, which can be used to find a config file from default paths.
+        self._exec = RcloneExec(None, get_rclone_exe(rclone_exe))
         if rclone_conf is None:
             from rclone_api.config import find_conf_file
 
             maybe_path = find_conf_file(self)
             if not isinstance(maybe_path, Path):
-                raise ValueError("Rclone config file not found")
+                warnings.warn("Rclone config file not found")
             rclone_conf = _to_rclone_conf(maybe_path)
+        # replace self._exec with one that has the config
         self._exec = RcloneExec(rclone_conf, get_rclone_exe(rclone_exe))
         self.config: Config = _to_rclone_conf(rclone_conf)
 
@@ -1334,9 +1340,6 @@ class RcloneImpl:
         if obscure:
             cmd_list.append("--obscure")
 
-        if no_obscure:
-            cmd_list.append("--no-obscure")
-
         try:
             cp = self._run(cmd_list, capture=True, check=True)
             stdout: str | bytes = cp.stdout

rclone_api/util.py

@@ -178,7 +178,7 @@ def upgrade_rclone() -> Path:
 
 def rclone_execute(
     cmd: list[str],
-    rclone_conf: Path | Config,
+    rclone_conf: Path | Config | None,
     rclone_exe: Path,
     check: bool,
     capture: bool | Path | None = None,
@@ -202,10 +202,10 @@ def rclone_execute(
             tmpfile.write_text(rclone_conf.text, encoding="utf-8")
             rclone_conf = tmpfile
 
-        # Build the command line.
-        full_cmd = (
-            [str(rclone_exe.resolve())] + ["--config", str(rclone_conf.resolve())] + cmd
-        )
+        full_cmd = [str(rclone_exe.resolve())]
+        if rclone_conf:
+            full_cmd += ["--config", str(rclone_conf.resolve())]
+        full_cmd += cmd
         if verbose:
             cmd_str = subprocess.list2cmdline(full_cmd)
             print(f"\nRunning: {cmd_str}")

{rclone_api-1.5.59.dist-info → rclone_api-1.5.61.dist-info}/METADATA

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

{rclone_api-1.5.59.dist-info → rclone_api-1.5.61.dist-info}/RECORD

@@ -1,31 +1,31 @@
 rclone_api/__init__.py,sha256=M3-jlyxhO7Md3FGMO8qBJ1Z7oLcbOjWshCHh2-CqKG4,34885
 rclone_api/cli.py,sha256=dibfAZIh0kXWsBbfp3onKLjyZXo54mTzDjUdzJlDlWo,231
 rclone_api/completed_process.py,sha256=_IZ8IWK7DM1_tsbDEkH6wPZ-bbcrgf7A7smls854pmg,1775
-rclone_api/config.py,sha256=DEBubN0ziUfAFYe6cmDn7YoTqRJPdGronFyRHZvWUso,6070
+rclone_api/config.py,sha256=URZwMME01f0EZymprCESuZ5dk4IuUSKbHhwIeTHrn7A,6131
 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
 rclone_api/dir.py,sha256=_9o-_5tbWVJkL1Vf_Yb8aiQV3xAqvUq5bk3zoJblvEg,3547
 rclone_api/dir_listing.py,sha256=bSmd8yZtSeyVaDRw2JPB4bCpbCeDzhoa_pomgdJp44c,1884
-rclone_api/exec.py,sha256=Bq0gkyZ10mEY0FRyzNZgdN4FaWP9vpeCk1kjpg-gN_8,1083
+rclone_api/exec.py,sha256=3x2FOrh_3Ml23sW_5fry3dmlKyHtq3iYKByLeZtbNcg,1090
 rclone_api/file.py,sha256=JLPqjUcW_YVb4UQjX6FQ7PABJqhchFUXVy1W-X9rJLk,5659
 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/group_files.py,sha256=H92xPW9lQnbNw5KbtZCl00bD6iRh9yRbCuxku4j_3dg,8036
-rclone_api/http_server.py,sha256=P-LT2GqCEM9tGbyzzr-CrSOc3FyCw1qXUSQ5bY2KBHU,12113
+rclone_api/http_server.py,sha256=ZzDVfuRtHBihxdVLUIHNvIZMixyYPm6N2iPHkfWx5eE,11942
 rclone_api/install.py,sha256=ZDG8QNj1JciS_DSqYnMTECwhJksUPAoqZQxtX804TDk,5679
 rclone_api/log.py,sha256=VZHM7pNSXip2ZLBKMP7M1u-rp_F7zoafFDuR8CPUoKI,1271
 rclone_api/mount.py,sha256=LZqEhuKZunbWVqmsOIqkkCotaxWJpdFRS1InXveoU5E,1428
 rclone_api/mount_util.py,sha256=jqhJEVTHV6c6lOOzUYb4FLMbqDMHdz7-QRcdH-IobFc,10154
-rclone_api/process.py,sha256=MeWiN-TrrN0HmtWexBPxGwf84z6f-_E5yaXE-YtLYpY,5879
-rclone_api/rclone_impl.py,sha256=s00SHQGcKskbauWiIZQBQKSR0NOJ6SSiXhMf0fwkl9U,52328
+rclone_api/process.py,sha256=V4Ax9AyNdC3m4O6gjWSbIJyCQCMhT-t0f-K8z6xux7Q,5946
+rclone_api/rclone_impl.py,sha256=FXIkDOGnqp7zN9pks3WXoruIJki9M2sJd0-QX5cMQgg,52603
 rclone_api/remote.py,sha256=mTgMTQTwxUmbLjTpr-AGTId2ycXKI9mLX5L7PPpDIoc,520
 rclone_api/rpath.py,sha256=Y1JjQWcie39EgQrq-UtbfDz5yDLCwwfu27W7AQXllSE,2860
 rclone_api/scan_missing_folders.py,sha256=-8NCwpCaHeHrX-IepCoAEsX1rl8S-GOCxcIhTr_w3gA,4747
 rclone_api/types.py,sha256=59Rw7NdHw35X6iiWMemO61IzCbrjgfNHUlzY3Dq0wdM,12303
-rclone_api/util.py,sha256=Xa_VifjNT_h9IMkqbnAmgSkEqqwczkGH_TcUUJHx-no,9546
+rclone_api/util.py,sha256=NIWU1YLGWyNhICwXCpmAw0AgCXkOYG6BO6m1mTNQwzY,9559
 rclone_api/assets/example.txt,sha256=lTBovRjiz0_TgtAtbA1C5hNi2ffbqnNPqkKg6UiKCT8,54
 rclone_api/cmd/analyze.py,sha256=RHbvk1G5ZUc3qLqlm1AZEyQzd_W_ZjcbCNDvW4YpTKQ,1252
 rclone_api/cmd/copy_large_s3.py,sha256=E0B7P-JJTuOM7wMZtwQHJCpoLhccJleh0mnMq8ZiSUo,3234
@@ -58,9 +58,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.59.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.5.59.dist-info/METADATA,sha256=SjT6yaIwQy9CcoSX5kdpxESo2iNTfRMA_MXfKUk83S0,37305
-rclone_api-1.5.59.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-rclone_api-1.5.59.dist-info/entry_points.txt,sha256=ognh2e11HTjn73_KL5MWI67pBKS2jekBi-QTiRXySXA,316
-rclone_api-1.5.59.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.5.59.dist-info/RECORD,,
+rclone_api-1.5.61.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+rclone_api-1.5.61.dist-info/METADATA,sha256=6euBxBpkAYSnNXNCu_JDaYOiTIDW6vzyzHxpx09u-0g,37305
+rclone_api-1.5.61.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+rclone_api-1.5.61.dist-info/entry_points.txt,sha256=ognh2e11HTjn73_KL5MWI67pBKS2jekBi-QTiRXySXA,316
+rclone_api-1.5.61.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
+rclone_api-1.5.61.dist-info/RECORD,,