rclone-api 1.5.46__py3-none-any.whl → 1.5.48__py3-none-any.whl

rclone_api/config.py

@@ -1,4 +1,5 @@
 import os
+import shutil
 from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Any, Dict, List
@@ -89,14 +90,16 @@ def find_conf_file(rclone: Any | None = None) -> Path | None:
         return conf
 
     if rclone is None:
-        from rclone_api.install import rclone_download
+        has_rclone = shutil.which("rclone")
+        if not has_rclone:
+            from rclone_api.install import rclone_download
 
-        err = rclone_download(Path("."))
-        if isinstance(err, Exception):
-            import warnings
+            err = rclone_download(Path("."))
+            if isinstance(err, Exception):
+                import warnings
 
-            warnings.warn(f"rclone_download failed: {err}")
-            return None
+                warnings.warn(f"rclone_download failed: {err}")
+                return None
         cmd_list: list[str] = [
             "rclone",
             "config",

rclone_api/install.py

@@ -79,31 +79,60 @@ def _move_to_standard_linux_paths(exe_path: Path) -> None:
         return
 
     try:
-        # Create directory in standard path if it doesn't exist
-        bin_path = Path("/usr/local/bin/rclone")
+        # Try system-wide installation first
+        system_bin_path = Path("/usr/local/bin/rclone")
 
         if os.access("/usr/local/bin", os.W_OK):
             # Remove existing binary if it exists
-            if bin_path.exists():
-                if bin_path.is_symlink():
-                    bin_path.unlink()
+            if system_bin_path.exists():
+                if system_bin_path.is_symlink():
+                    system_bin_path.unlink()
                 else:
-                    os.remove(bin_path)
+                    os.remove(system_bin_path)
 
             # Move the binary to standard path
-            shutil.move(str(exe_path), str(bin_path))
+            shutil.move(str(exe_path), str(system_bin_path))
 
             # Make it executable
-            os.chmod(bin_path, 0o755)
+            os.chmod(system_bin_path, 0o755)
 
             # Create a symlink in the original location
-            exe_path.symlink_to(bin_path)
+            exe_path.symlink_to(system_bin_path)
 
-            logger.info(f"Moved rclone to {bin_path} and created symlink at {exe_path}")
+            logger.info(
+                f"Moved rclone to {system_bin_path} and created symlink at {exe_path}"
+            )
         else:
-            logger.warning(
-                "No write permission to /usr/local/bin, skipping move operation"
+            # Fall back to user's home directory if no root access
+            home_bin_dir = Path.home() / ".local" / "bin"
+            home_bin_dir.mkdir(parents=True, exist_ok=True)
+            home_bin_path = home_bin_dir / "rclone"
+
+            # Remove existing binary if it exists
+            if home_bin_path.exists():
+                if home_bin_path.is_symlink():
+                    home_bin_path.unlink()
+                else:
+                    os.remove(home_bin_path)
+
+            # Move the binary to user's bin directory
+            shutil.move(str(exe_path), str(home_bin_path))
+
+            # Make it executable
+            os.chmod(home_bin_path, 0o755)
+
+            # Create a symlink in the original location
+            exe_path.symlink_to(home_bin_path)
+
+            logger.info(
+                f"Moved rclone to {home_bin_path} and created symlink at {exe_path}"
             )
+
+            # Check if ~/.local/bin is in PATH, if not suggest adding it
+            if str(home_bin_dir) not in os.environ.get("PATH", ""):
+                logger.warning(
+                    f"{home_bin_dir} is not in PATH. Consider adding it to your shell profile."
+                )
     except Exception as e:
         logger.warning(f"Failed to move rclone to standard paths: {e}")
 

{rclone_api-1.5.46.dist-info → rclone_api-1.5.48.dist-info}/METADATA

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

{rclone_api-1.5.46.dist-info → rclone_api-1.5.48.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=JxYqcUgfqGpGzh6qayiRsnaPaFeWRza2QTrOcVNxszk,5961
+rclone_api/config.py,sha256=DEBubN0ziUfAFYe6cmDn7YoTqRJPdGronFyRHZvWUso,6070
 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
@@ -16,7 +16,7 @@ rclone_api/filelist.py,sha256=xbiusvNgaB_b_kQOZoHMJJxn6TWGtPrWd2J042BI28o,767
 rclone_api/fs.py,sha256=xUkoSV2R9dByKgueZ3x2GjyCn9fM7tK1ydgK1Whiph0,8933
 rclone_api/group_files.py,sha256=H92xPW9lQnbNw5KbtZCl00bD6iRh9yRbCuxku4j_3dg,8036
 rclone_api/http_server.py,sha256=P-LT2GqCEM9tGbyzzr-CrSOc3FyCw1qXUSQ5bY2KBHU,12113
-rclone_api/install.py,sha256=db7l5KoVBr84HbFxih1Sd82tUfzhOuczKfBLb_Dn3XU,4507
+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
@@ -55,9 +55,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.46.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.5.46.dist-info/METADATA,sha256=KqRtpIh195KJQ-8gY8HYZLcY4Qm1KUFVXC5XCw_av8o,37305
-rclone_api-1.5.46.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-rclone_api-1.5.46.dist-info/entry_points.txt,sha256=ognh2e11HTjn73_KL5MWI67pBKS2jekBi-QTiRXySXA,316
-rclone_api-1.5.46.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.5.46.dist-info/RECORD,,
+rclone_api-1.5.48.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+rclone_api-1.5.48.dist-info/METADATA,sha256=oJftVhJmDY8KBcLOlUSGk23lUWpjmRnkOSrpoPuy2GQ,37305
+rclone_api-1.5.48.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+rclone_api-1.5.48.dist-info/entry_points.txt,sha256=ognh2e11HTjn73_KL5MWI67pBKS2jekBi-QTiRXySXA,316
+rclone_api-1.5.48.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
+rclone_api-1.5.48.dist-info/RECORD,,