rclone-api 1.5.71__py3-none-any.whl → 1.5.73__py3-none-any.whl

rclone_api/fs/filesystem.py

@@ -40,6 +40,16 @@ class FS(abc.ABC):
         """First is files and second is directories."""
         pass
 
+    @abc.abstractmethod
+    def remove(self, path: Path | str) -> Exception | None:
+        """Remove a file or symbolic link."""
+        pass
+
+    @abc.abstractmethod
+    def unlink(self, path: Path | str) -> Exception | None:
+        """Remove a file or symbolic link."""
+        pass
+
     @abc.abstractmethod
     def cwd(self) -> "FSPath":
         pass
@@ -86,6 +96,30 @@ class RealFS(FS):
     def exists(self, path: Path | str) -> bool:
         return Path(path).exists()
 
+    def unlink(self, path: Path | str) -> Exception | None:
+        """Remove a file or symbolic link."""
+        try:
+            Path(path).unlink()
+            return None
+        except KeyboardInterrupt:
+            raise
+        except FileNotFoundError as e:
+            return e
+
+    def remove(self, path: Path | str, ignore_errors=False) -> Exception | None:
+        """Remove a file or directory."""
+        try:
+            path = Path(path)
+            if path.is_dir():
+                shutil.rmtree(path, ignore_errors=ignore_errors)
+            else:
+                path.unlink()
+            return None
+        except KeyboardInterrupt:
+            raise
+        except Exception as e:
+            return e
+
     def mkdir(self, path: str, parents=True, exist_ok=True) -> None:
         Path(path).mkdir(parents=parents, exist_ok=exist_ok)
 
@@ -141,16 +175,16 @@ class RemoteFS(FS):
         from rclone_api.completed_process import CompletedProcess
 
         src = src if isinstance(src, Path) else Path(src)
-        if not src.is_file():
-            raise FileNotFoundError(f"File not found: {src}")
-        dst = self._to_remote_path(dst)
+        # if not src.is_file():
+        #     raise FileNotFoundError(f"File not found: {src}")
+        dst_remote_path = self._to_remote_path(dst)
 
-        is_s3 = self.rclone.is_s3(dst)
+        is_s3 = self.rclone.is_s3(dst_remote_path)
         if is_s3:
             filesize = src.stat().st_size
             if filesize < 1024 * 1024 * 1024:  # 1GB
-                logger.info(f"S3 OPTIMIZED: Copying {src} -> {dst}")
-                err = self.rclone.copy_file_s3(src, dst)
+                logger.info(f"S3 OPTIMIZED: Copying {src} -> {dst_remote_path}")
+                err = self.rclone.copy_file_s3(src, dst_remote_path)
                 if isinstance(err, Exception):
                     raise FileNotFoundError(
                         f"File not found: {src}, specified by {err}"
@@ -159,7 +193,8 @@ class RemoteFS(FS):
         # Fallback.
         logging.info(f"Copying {src} -> {dst}")
         src_path = src.as_posix()
-        cp: CompletedProcess = self.rclone.copy(src_path, dst)
+        dst = dst if isinstance(dst, str) else dst.as_posix()
+        cp: CompletedProcess = self.rclone.copy_to(src_path, dst)
         if cp.returncode != 0:
             raise FileNotFoundError(f"File not found: {src}, specified by {cp.stderr}")
 
@@ -216,6 +251,24 @@ class RemoteFS(FS):
             raise FileNotFoundError(f"File not found: {path}, because of {err}")
         return err
 
+    def unlink(self, path: Path | str) -> Exception | None:
+        return self.remove(path)
+
+    def remove(self, path: Path | str) -> Exception | None:
+        """Remove a file or symbolic link."""
+
+        # remove this
+        # path = self._to_remote_path(path)
+        path = path if isinstance(path, str) else path.as_posix()
+        err = self.rclone.delete_files(path)
+        if isinstance(err, Exception):
+            return FileNotFoundError(f"File not found: {path}, because of {err}")
+        if isinstance(path, Path):
+            path = path.as_posix()
+        # assert isinstance(self.server, HttpServer)
+        # self.server.delete(path)
+        return None
+
     def get_path(self, path: str) -> "FSPath":
         return FSPath(self, path)
 
@@ -316,14 +369,35 @@ class FSPath:
             encoding = "utf-8"
         self.write_bytes(data.encode(encoding))
 
+    def moveTo(self, dst: "FSPath") -> None:
+        """Move a file or directory."""
+        # assert self.exists(), f"Path does not exist: {self.path}"
+        # assert not dst.exists(), f"Destination path already exists: {dst.path}"
+        self.fs.copy(self.path, dst.path)
+        self.fs.remove(self.path)
+
     def write_bytes(self, data: bytes) -> None:
         self.fs.write_binary(self.path, data)
 
     def rmtree(self, ignore_errors=False) -> None:
-        assert self.exists(), f"Path does not exist: {self.path}"
+        self_exists = self.exists()
+        if not ignore_errors:
+            assert self_exists, f"Path does not exist: {self.path}"
         # check fs is RealFS
-        assert isinstance(self.fs, RealFS)
-        shutil.rmtree(self.path, ignore_errors=ignore_errors)
+        # assert isinstance(self.fs, RealFS)
+        # shutil.rmtree(self.path, ignore_errors=ignore_errors)
+        if isinstance(self.fs, RealFS):
+            shutil.rmtree(self.path, ignore_errors=ignore_errors)
+            return
+        assert isinstance(self.fs, RemoteFS)
+        # walk the directory
+        for root, _, filenames in self.walk():
+            # for dirname in dirnames:
+            #     path = root / dirname
+            #     path.remove()
+            for filename in filenames:
+                path = root / filename
+                path.remove()
 
     def lspaths(self) -> "tuple[list[FSPath], list[FSPath]]":
         filenames, dirnames = self.ls()
@@ -337,6 +411,14 @@ class FSPath:
         filenames, dirnames = self.fs.ls(self.path)
         return filenames, dirnames
 
+    def remove(self) -> Exception | None:
+        """Remove a file or directory, there are subtle differences between the Real and RemoteFS."""
+        return self.fs.remove(self.path)
+
+    def unlink(self) -> Exception | None:
+        """Remove a file or symbolic link, there are subtle differences between the Real and RemoteFS."""
+        return self.fs.unlink(self.path)
+
     def with_suffix(self, suffix: str) -> "FSPath":
         return FSPath(self.fs, Path(self.path).with_suffix(suffix).as_posix())
 

rclone_api/group_files.py

@@ -34,6 +34,10 @@ def parse_file(file_path: str) -> FilePathParts:
     """Parse file path into parts."""
     assert not file_path.endswith("/"), "This looks like a directory path"
     parts = file_path.split(":")
+    if len(parts) < 2:
+        raise ValueError(
+            f"Invalid file path: {file_path}, expected fully qualified path like dst:Bucket/subdir/file.txt"
+        )
     remote = parts[0]
     path = parts[1]
     if path.startswith("/"):

rclone_api/rclone_impl.py

@@ -871,15 +871,21 @@ class RcloneImpl:
         """Check if a remote is an S3 remote."""
         from rclone_api.util import S3PathInfo
 
-        path_info: S3PathInfo = S3PathInfo.from_str(dst)
-        remote = path_info.remote
-        parsed: Parsed = self.config.parse()
-        sections: dict[str, Section] = parsed.sections
-        if remote not in sections:
+        try:
+            path_info: S3PathInfo = S3PathInfo.from_str(dst)
+            remote = path_info.remote
+            parsed: Parsed = self.config.parse()
+            sections: dict[str, Section] = parsed.sections
+            if remote not in sections:
+                return False
+            section: Section = sections[remote]
+            t = section.type()
+            return t in ["s3", "b2"]
+        except KeyboardInterrupt:
+            raise
+        except Exception as e:
+            logging.error(f"Error checking if remote is S3: {e}")
             return False
-        section: Section = sections[remote]
-        t = section.type()
-        return t in ["s3", "b2"]
 
     def copy_file_s3_resumable(
         self,
@@ -1298,6 +1304,8 @@ class RcloneImpl:
             "0",
             "--vfs-read-chunk-size-limit",
             "512M",
+            # "--attr-timeout",
+            # "0s",
         ]
 
         if cache_mode:

{rclone_api-1.5.71.dist-info → rclone_api-1.5.73.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rclone_api
-Version: 1.5.71
+Version: 1.5.73
 Summary: rclone api in python
 Home-page: https://github.com/zackees/rclone-api
 License: BSD 3-Clause License
@@ -13,13 +13,13 @@ Requires-Dist: pyright>=1.1.393
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: certifi>=2025.1.31
 Requires-Dist: psutil
-Requires-Dist: boto3<=1.35.99,>=1.20.1
 Requires-Dist: sqlmodel>=0.0.23
 Requires-Dist: psycopg2-binary>=2.9.10
 Requires-Dist: httpx>=0.28.1
 Requires-Dist: download>=0.3.5
 Requires-Dist: appdirs>=1.4.4
 Requires-Dist: beautifulsoup4>=4.13.3
+Requires-Dist: boto3>=1.28.23
 Dynamic: home-page
 Dynamic: license-file
 

{rclone_api-1.5.71.dist-info → rclone_api-1.5.73.dist-info}/RECORD

@@ -13,14 +13,14 @@ 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/group_files.py,sha256=n-mzL94PxoKEASMCI1_OB5FEiFmcpjDpRLs1ynV4RrY,8204
 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=rNBflKF2QgiTVjOO52_YcrnQk7fdYr-U5divqO5I2ww,6048
-rclone_api/rclone_impl.py,sha256=PppFWk4qo7gg6p_k3K7am3_6pytsLG6qTAKo6dBT-tI,52649
+rclone_api/rclone_impl.py,sha256=4QPfqKHfJ6_TrsJCURjZ6u-gpfWZJR7Ixji7Vw4SfmA,52932
 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
@@ -40,7 +40,7 @@ rclone_api/detail/copy_file_parts_resumable.py,sha256=RoUWV2eBWEvuuTfsvrz5BhtvX3
 rclone_api/detail/walk.py,sha256=-54NVE8EJcCstwDoaC_UtHm73R2HrZwVwQmsnv55xNU,3369
 rclone_api/experimental/flags.py,sha256=qCVD--fSTmzlk9hloRLr0q9elzAOFzPsvVpKM3aB1Mk,2739
 rclone_api/experimental/flags_base.py,sha256=ajU_czkTcAxXYU-SlmiCfHY7aCQGHvpCLqJ-Z8uZLk0,2102
-rclone_api/fs/filesystem.py,sha256=2Ewa5g_842XU-UT4JDkPkq199pjknjoqpTiKtbRRRGk,11964
+rclone_api/fs/filesystem.py,sha256=iVkG4jw_lHiXOei1w02DrtSoKqZeTA-yQ68T5_uPNVs,15080
 rclone_api/fs/walk.py,sha256=gqxfJqzFSQlLwZ18ttO25SbCCs7Vcz_CtlDgjiqpNZc,2183
 rclone_api/fs/walk_threaded.py,sha256=zlbooQ7WbteUK1cCjm1Yj66VpDzS8Qm3DcHBSz1Gbjk,1591
 rclone_api/fs/walk_threaded_walker.py,sha256=xi0QkmmzI35NcaA08FLjGe7ox9tLZcgXtOZCT8nMuWU,718
@@ -58,9 +58,9 @@ rclone_api/s3/multipart/upload_parts_inline.py,sha256=V7syKjFyVIe4U9Ahl5XgqVTzt9
 rclone_api/s3/multipart/upload_parts_resumable.py,sha256=tdOkEfoK9zENaTfgVyTWB5GNqn-IYl-zJn-rJLcoVTo,12388
 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.71.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.5.71.dist-info/METADATA,sha256=qnLOllDyan73gwf8Nb5W5B9vhYnRUP1fRhRrA-5c56Q,37305
-rclone_api-1.5.71.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
-rclone_api-1.5.71.dist-info/entry_points.txt,sha256=ognh2e11HTjn73_KL5MWI67pBKS2jekBi-QTiRXySXA,316
-rclone_api-1.5.71.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.5.71.dist-info/RECORD,,
+rclone_api-1.5.73.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+rclone_api-1.5.73.dist-info/METADATA,sha256=2C5YAjqXGRm8rdvnzPZB9HvEmWaXzlQjHTSA1bC5UeI,37296
+rclone_api-1.5.73.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+rclone_api-1.5.73.dist-info/entry_points.txt,sha256=ognh2e11HTjn73_KL5MWI67pBKS2jekBi-QTiRXySXA,316
+rclone_api-1.5.73.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
+rclone_api-1.5.73.dist-info/RECORD,,

{rclone_api-1.5.71.dist-info → rclone_api-1.5.73.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.0.0)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any