rclone-api 1.5.22__py3-none-any.whl → 1.5.24__py3-none-any.whl

rclone_api/fs.py

@@ -14,7 +14,7 @@ class FS(abc.ABC):
         pass
 
     @abc.abstractmethod
-    def read_binary(self, path: Path | str) -> bytes:
+    def read_bytes(self, path: Path | str) -> bytes:
         pass
 
     @abc.abstractmethod
@@ -41,15 +41,6 @@ class FS(abc.ABC):
     def get_path(self, path: str) -> "FSPath":
         pass
 
-    def read_text(self, path: Path | str) -> str:
-        utf = self.read_binary(path)
-        return utf.decode("utf-8")
-
-    def write_text(self, path: Path | str, data: str, encoding: str | None) -> None:
-        encoding = encoding or "utf-8"
-        utf = data.encode(encoding)
-        self.write_binary(path, utf)
-
 
 class RealFS(FS):
 
@@ -70,7 +61,7 @@ class RealFS(FS):
     def copy(self, src: Path | str, dest: Path | str) -> None:
         shutil.copy(str(src), str(dest))
 
-    def read_binary(self, path: Path | str) -> bytes:
+    def read_bytes(self, path: Path | str) -> bytes:
         with open(path, "rb") as f:
             return f.read()
 
@@ -125,12 +116,15 @@ class RemoteFS(FS):
             return path.as_posix()
         return path
 
+    def _to_remote_path(self, path: str | Path) -> str:
+        return Path(path).relative_to(self.src).as_posix()
+
     def copy(self, src: Path | str, dest: Path | str) -> None:
         src = self._to_str(src)
-        dest = self._to_str(dest)
+        dest = self._to_remote_path(dest)
         self.rclone.copy(src, dest)
 
-    def read_binary(self, path: Path | str) -> bytes:
+    def read_bytes(self, path: Path | str) -> bytes:
         path = self._to_str(path)
         err = self.rclone.read_bytes(path)
         if isinstance(err, Exception):
@@ -143,27 +137,29 @@ class RemoteFS(FS):
 
     def exists(self, path: Path | str) -> bool:
         path = self._to_str(path)
-        return self.server.exists(path)
+        dst_rel = self._to_remote_path(path)
+        return self.server.exists(dst_rel)
 
     def mkdir(self, path: str, parents=True, exist_ok=True) -> None:
         # Ignore mkdir for remote backend, it will be made when file is written.
         import warnings
+
         warnings.warn("mkdir is not supported for remote backend", stacklevel=2)
         return None
 
     def is_dir(self, path: Path | str) -> bool:
-        path = self._to_str(path)
+        path = self._to_remote_path(path)
         err = self.server.list(path)
         return isinstance(err, list)
 
     def is_file(self, path: Path | str) -> bool:
-        path = self._to_str(path)
+        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]:
-        path = self._to_str(path)
+        path = self._to_remote_path(path)
         err = self.server.list(path)
         if isinstance(err, Exception):
             raise FileNotFoundError(f"File not found: {path}, because of {err}")
@@ -188,10 +184,16 @@ class FSPath:
         self.path = path
 
     def read_text(self) -> str:
-        return self.fs.read_text(self.path)
+        data = self.read_bytes()
+        return data.decode("utf-8")
 
-    def read_binary(self) -> bytes:
-        return self.fs.read_binary(self.path)
+    def read_bytes(self) -> bytes:
+        data: bytes | None = None
+        try:
+            data = self.fs.read_bytes(self.path)
+            return data
+        except Exception as e:
+            raise FileNotFoundError(f"File not found: {self.path}, because of {e}")
 
     def exists(self) -> bool:
         return self.fs.exists(self.path)
@@ -206,7 +208,12 @@ class FSPath:
         self.fs.mkdir(self.path, parents=parents, exist_ok=exist_ok)
 
     def write_text(self, data: str, encoding: str | None = None) -> None:
-        self.fs.write_text(self.path, data, encoding=encoding)
+        if encoding is None:
+            encoding = "utf-8"
+        self.write_bytes(data.encode(encoding))
+
+    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}"

{rclone_api-1.5.22.dist-info → rclone_api-1.5.24.dist-info}/METADATA

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

{rclone_api-1.5.22.dist-info → rclone_api-1.5.24.dist-info}/RECORD

@@ -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=1hdRw-7NQnWJSmq6U2d9p2S9UNcND3cJIlDIFfyhQ1o,6898
+rclone_api/fs.py,sha256=drSne7MnV0t8LpsGV4EpWRJ5CoH4HU3ohrE5-eBG05w,7124
 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.22.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.5.22.dist-info/METADATA,sha256=9bBj235dgclFZikP1fwFFsVKrKz2yYqczJlBJoA4H-o,37155
-rclone_api-1.5.22.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-rclone_api-1.5.22.dist-info/entry_points.txt,sha256=fJteOlYVwgX3UbNuL9jJ0zUTuX2O79JFAeNgK7Sw7EQ,255
-rclone_api-1.5.22.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.5.22.dist-info/RECORD,,
+rclone_api-1.5.24.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+rclone_api-1.5.24.dist-info/METADATA,sha256=X6Vra_UInDzwFwD1zC5tsGZcW_SI8JP5d71h9b2OTy4,37155
+rclone_api-1.5.24.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+rclone_api-1.5.24.dist-info/entry_points.txt,sha256=fJteOlYVwgX3UbNuL9jJ0zUTuX2O79JFAeNgK7Sw7EQ,255
+rclone_api-1.5.24.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
+rclone_api-1.5.24.dist-info/RECORD,,