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

rclone_api/cmd/install_rclone.py

@@ -2,6 +2,7 @@
 Unit test file.
 """
 
+import logging
 import platform
 from pathlib import Path
 
@@ -9,6 +10,9 @@ from rclone_api.install import rclone_download
 
 
 def main() -> None:
+    # set the root logger level to DEBUG
+    root_logger = logging.getLogger()
+    root_logger.setLevel(logging.DEBUG)
     rclone_exe = "rclone"
     if platform.system() == "Windows":
         rclone_exe += ".exe"

rclone_api/install.py

@@ -1,95 +1,139 @@
-import os
-import platform
-import shutil
-from pathlib import Path
-from tempfile import TemporaryDirectory
-from warnings import warn
-
-from download import download
-
-URL_WINDOWS = "https://downloads.rclone.org/rclone-current-windows-amd64.zip"
-URL_LINUX = "https://downloads.rclone.org/rclone-current-linux-amd64.zip"
-URL_MACOS_ARM = "https://downloads.rclone.org/rclone-current-osx-arm64.zip"
-URL_MACOS_X86 = "https://downloads.rclone.org/rclone-current-osx-amd64.zip"
-
-
-def rclone_download_url() -> str:
-    system = platform.system()
-    arch = platform.machine()
-    if system == "Windows":
-        assert "arm" not in arch, f"Unsupported arch: {arch}"
-        return URL_WINDOWS
-    elif system == "Linux":
-        assert "arm" not in arch, f"Unsupported arch: {arch}"
-        return URL_LINUX
-    elif system == "Darwin":
-        if "x86" in arch:
-            return URL_MACOS_X86
-        elif "arm" in arch:
-            return URL_MACOS_ARM
-        else:
-            raise Exception(f"Unsupported arch: {arch}")
-    else:
-        raise Exception("Unsupported system")
-
-
-def _remove_signed_binary_requirements(out: Path) -> None:
-    if platform.system() == "Windows":
-        return
-    # mac os
-    if platform.system() == "Darwin":
-        # remove signed binary requirements
-        #
-        # xattr -d com.apple.quarantine rclone
-        import subprocess
-
-        subprocess.run(
-            ["xattr", "-d", "com.apple.quarantine", str(out)],
-            capture_output=True,
-            check=False,
-        )
-        return
-
-
-def _make_executable(out: Path) -> None:
-    if platform.system() == "Windows":
-        return
-    # linux and mac os
-    os.chmod(out, 0o755)
-
-
-def _find_rclone_exe(start: Path) -> Path | None:
-    for root, dirs, files in os.walk(start):
-        if platform.system() == "Windows":
-            if "rclone.exe" in files:
-                return Path(root) / "rclone.exe"
-        else:
-            if "rclone" in files:
-                return Path(root) / "rclone"
-    return None
-
-
-def rclone_download(out: Path, replace=False) -> Exception | None:
-    if out.exists() and not replace:
-        return None
-    try:
-        url = rclone_download_url()
-        with TemporaryDirectory() as tmpdir:
-            tmp = Path(tmpdir)
-            download(url, tmp, kind="zip", replace=True)
-            exe = _find_rclone_exe(tmp)
-            if exe is None:
-                raise FileNotFoundError("rclone executable not found")
-            if os.path.exists(out):
-                os.remove(out)
-            out.parent.mkdir(parents=True, exist_ok=True)
-            shutil.move(exe, out)
-        _remove_signed_binary_requirements(out)
-        _make_executable(out)
-        return None
-    except Exception as e:
-        import traceback
-
-        stacktrace = traceback.format_exc()
-        warn(f"Failed to download rclone: {e}\n{stacktrace}")
-        return e
+import logging
+import os
+import platform
+import shutil
+from pathlib import Path
+from tempfile import TemporaryDirectory
+from warnings import warn
+
+from download import download
+
+URL_WINDOWS = "https://downloads.rclone.org/rclone-current-windows-amd64.zip"
+URL_LINUX = "https://downloads.rclone.org/rclone-current-linux-amd64.zip"
+URL_MACOS_ARM = "https://downloads.rclone.org/rclone-current-osx-arm64.zip"
+URL_MACOS_X86 = "https://downloads.rclone.org/rclone-current-osx-amd64.zip"
+
+logger = logging.getLogger(__name__)
+logging.basicConfig(level=logging.DEBUG)
+
+
+def rclone_download_url() -> str:
+    system = platform.system()
+    arch = platform.machine()
+    if system == "Windows":
+        assert "arm" not in arch, f"Unsupported arch: {arch}"
+        return URL_WINDOWS
+    elif system == "Linux":
+        assert "arm" not in arch, f"Unsupported arch: {arch}"
+        return URL_LINUX
+    elif system == "Darwin":
+        if "x86" in arch:
+            return URL_MACOS_X86
+        elif "arm" in arch:
+            return URL_MACOS_ARM
+        else:
+            raise Exception(f"Unsupported arch: {arch}")
+    else:
+        raise Exception("Unsupported system")
+
+
+def _remove_signed_binary_requirements(out: Path) -> None:
+    if platform.system() == "Windows":
+        return
+    # mac os
+    if platform.system() == "Darwin":
+        # remove signed binary requirements
+        #
+        # xattr -d com.apple.quarantine rclone
+        import subprocess
+
+        subprocess.run(
+            ["xattr", "-d", "com.apple.quarantine", str(out)],
+            capture_output=True,
+            check=False,
+        )
+        return
+
+
+def _make_executable(out: Path) -> None:
+    if platform.system() == "Windows":
+        return
+    # linux and mac os
+    os.chmod(out, 0o755)
+
+
+def _find_rclone_exe(start: Path) -> Path | None:
+    for root, dirs, files in os.walk(start):
+        if platform.system() == "Windows":
+            if "rclone.exe" in files:
+                return Path(root) / "rclone.exe"
+        else:
+            if "rclone" in files:
+                return Path(root) / "rclone"
+    return None
+
+
+def _move_to_standard_linux_paths(exe_path: Path) -> None:
+    """Move rclone to standard paths on Linux systems and create a symlink in the original location."""
+    if platform.system() != "Linux":
+        return
+
+    try:
+        # Create directory in standard path if it doesn't exist
+        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()
+                else:
+                    os.remove(bin_path)
+
+            # Move the binary to standard path
+            shutil.move(str(exe_path), str(bin_path))
+
+            # Make it executable
+            os.chmod(bin_path, 0o755)
+
+            # Create a symlink in the original location
+            exe_path.symlink_to(bin_path)
+
+            logger.info(f"Moved rclone to {bin_path} and created symlink at {exe_path}")
+        else:
+            logger.warning(
+                "No write permission to /usr/local/bin, skipping move operation"
+            )
+    except Exception as e:
+        logger.warning(f"Failed to move rclone to standard paths: {e}")
+
+
+def rclone_download(out: Path, replace=False) -> Exception | None:
+    if out.exists() and not replace:
+        return None
+    try:
+        url = rclone_download_url()
+        with TemporaryDirectory() as tmpdir:
+            tmp = Path(tmpdir)
+            logging.info(f"Downloading rclone from {url} to {tmp.absolute()}")
+            download(url, tmp, kind="zip", replace=True)
+            exe = _find_rclone_exe(tmp)
+            if exe is None:
+                raise FileNotFoundError("rclone executable not found")
+            if os.path.exists(out):
+                os.remove(out)
+            out.parent.mkdir(parents=True, exist_ok=True)
+            shutil.move(exe, out)
+        _remove_signed_binary_requirements(out)
+        _make_executable(out)
+
+        # Move to standard paths on Linux
+        _move_to_standard_linux_paths(out)
+
+        return None
+    except Exception as e:
+        import traceback
+
+        stacktrace = traceback.format_exc()
+        warn(f"Failed to download rclone: {e}\n{stacktrace}")
+        return e

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

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

{rclone_api-1.5.44.dist-info → rclone_api-1.5.46.dist-info}/RECORD

@@ -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=Xb1BRn8rQcSpSd4dzmvIOELP2zM2DytUeIZ6jzv738A,2893
+rclone_api/install.py,sha256=db7l5KoVBr84HbFxih1Sd82tUfzhOuczKfBLb_Dn3XU,4507
 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
@@ -31,7 +31,7 @@ rclone_api/assets/example.txt,sha256=lTBovRjiz0_TgtAtbA1C5hNi2ffbqnNPqkKg6UiKCT8
 rclone_api/cmd/analyze.py,sha256=RHbvk1G5ZUc3qLqlm1AZEyQzd_W_ZjcbCNDvW4YpTKQ,1252
 rclone_api/cmd/copy_large_s3.py,sha256=E0B7P-JJTuOM7wMZtwQHJCpoLhccJleh0mnMq8ZiSUo,3234
 rclone_api/cmd/copy_large_s3_finish.py,sha256=SNCqkvu8YtxPKmBp37WVMP876YhxV0kJDoYuOSNPaPY,2309
-rclone_api/cmd/install_rclone.py,sha256=iy8XMZL_YSGhFVfVBPwGST8G3VcZGYBK9ctdg5UqKas,326
+rclone_api/cmd/install_rclone.py,sha256=F2iqbrla02SS45-On-PDX92EGQw3T7nRsjBftupNqQ0,460
 rclone_api/cmd/list_files.py,sha256=x8FHODEilwKqwdiU1jdkeJbLwOqUkUQuDWPo2u_zpf0,741
 rclone_api/cmd/save_to_db.py,sha256=ylvnhg_yzexM-m6Zr7XDiswvoDVSl56ELuFAdb9gqBY,1957
 rclone_api/db/__init__.py,sha256=OSRUdnSWUlDTOHmjdjVmxYTUNpTbtaJ5Ll9sl-PfZg0,40
@@ -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.44.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.5.44.dist-info/METADATA,sha256=PY16Qd_EUh8ozilT737GPVqua1WVpkbKZ8PYT9YWGik,37305
-rclone_api-1.5.44.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-rclone_api-1.5.44.dist-info/entry_points.txt,sha256=ognh2e11HTjn73_KL5MWI67pBKS2jekBi-QTiRXySXA,316
-rclone_api-1.5.44.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.5.44.dist-info/RECORD,,
+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,,