rclone-api 1.0.36__tar.gz → 1.0.38__tar.gz

{rclone_api-1.0.36 → rclone_api-1.0.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rclone_api
-Version: 1.0.36
+Version: 1.0.38
 Summary: rclone api in python
 Home-page: https://github.com/zackees/rclone-api
 Maintainer: Zachary Vorhies

{rclone_api-1.0.36 → rclone_api-1.0.38}/pyproject.toml

@@ -15,7 +15,7 @@ dependencies = [
     "python-dotenv>=1.0.0",
 ]
 # Change this with the version number bump.
-version = "1.0.36"
+version = "1.0.38"
 
 [tool.setuptools]
 package-dir = {"" = "src"}

rclone_api-1.0.38/src/rclone_api/completed_process.py

@@ -0,0 +1,15 @@
+import subprocess
+from dataclasses import dataclass
+
+
+@dataclass
+class CompletedProcess:
+    completed: list[subprocess.CompletedProcess]
+
+    @property
+    def ok(self) -> bool:
+        return all([p.returncode == 0 for p in self.completed])
+
+    @staticmethod
+    def from_subprocess(process: subprocess.CompletedProcess) -> "CompletedProcess":
+        return CompletedProcess(completed=[process])

{rclone_api-1.0.36 → rclone_api-1.0.38}/src/rclone_api/diff.py

@@ -94,7 +94,6 @@ def _async_diff_stream_from_running_process(
                 print("UnicodeDecodeError")
                 continue
         output.put(None)
-        print("done")
     except KeyboardInterrupt:
         import _thread
 

{rclone_api-1.0.36 → rclone_api-1.0.38}/src/rclone_api/rclone.py

@@ -12,6 +12,7 @@ from tempfile import TemporaryDirectory
 from typing import Generator
 
 from rclone_api import Dir
+from rclone_api.completed_process import CompletedProcess
 from rclone_api.config import Config
 from rclone_api.convert import convert_to_filestr_list, convert_to_str
 from rclone_api.deprecated import deprecated
@@ -216,7 +217,7 @@ class Rclone:
                 include_files_txt = Path(tmpdir) / "include_files.txt"
                 include_files_txt.write_text("\n".join(files), encoding="utf-8")
 
-                print(include_files_txt)
+                # print(include_files_txt)
                 cmd_list: list[str] = [
                     "delete",
                     remote,
@@ -234,7 +235,7 @@ class Rclone:
 
         assert out is not None
 
-    def copy(self, src: Dir | str, dst: Dir | str) -> subprocess.CompletedProcess:
+    def copy(self, src: Dir | str, dst: Dir | str) -> CompletedProcess:
         """Copy files from source to destination.
 
         Args:
@@ -246,37 +247,42 @@ class Rclone:
         src_dir = convert_to_str(src)
         dst_dir = convert_to_str(dst)
         cmd_list: list[str] = ["copy", src_dir, dst_dir]
-        return self._run(cmd_list)
+        cp = self._run(cmd_list)
+        return CompletedProcess.from_subprocess(cp)
 
-    def purge(self, path: Dir | str) -> subprocess.CompletedProcess:
+    def purge(self, path: Dir | str) -> CompletedProcess:
         """Purge a directory"""
         # path should always be a string
         path = path if isinstance(path, str) else str(path.path)
         cmd_list: list[str] = ["purge", str(path)]
-        return self._run(cmd_list)
+        cp = self._run(cmd_list)
+        return CompletedProcess.from_subprocess(cp)
 
     def delete_files(
-        self, files: str | File | list[str] | list[File]
-    ) -> subprocess.CompletedProcess:
+        self, files: str | File | list[str] | list[File], check=True
+    ) -> CompletedProcess:
         """Delete a directory"""
         payload: list[str] = convert_to_filestr_list(files)
         if len(payload) == 0:
-            return subprocess.CompletedProcess(
+            cp = subprocess.CompletedProcess(
                 args=["rclone", "delete", "--files-from", "[]"],
                 returncode=0,
                 stdout="",
                 stderr="",
             )
+            return CompletedProcess.from_subprocess(cp)
 
         datalists: dict[str, list[str]] = partition_files(payload)
         out: subprocess.CompletedProcess | None = None
 
+        completed_processes: list[subprocess.CompletedProcess] = []
+
         for remote, files in datalists.items():
             with TemporaryDirectory() as tmpdir:
                 include_files_txt = Path(tmpdir) / "include_files.txt"
                 include_files_txt.write_text("\n".join(files), encoding="utf-8")
 
-                print(include_files_txt)
+                # print(include_files_txt)
                 cmd_list: list[str] = [
                     "delete",
                     remote,
@@ -288,18 +294,23 @@ class Rclone:
                     "1000",
                 ]
                 out = self._run(cmd_list)
+                completed_processes.append(out)
                 if out.returncode != 0:
-                    print(out)
-                    raise ValueError(f"Error deleting files: {out.stderr}")
+                    if check:
+                        completed_processes.append(out)
+                        raise ValueError(f"Error deleting files: {out}")
+                    else:
+                        warnings.warn(f"Error deleting files: {out}")
 
         assert out is not None
-        return out
+        return CompletedProcess(completed_processes)
 
     @deprecated("delete_files")
     def deletefiles(
         self, files: str | File | list[str] | list[File]
-    ) -> subprocess.CompletedProcess:
-        return self.delete_files(files)
+    ) -> CompletedProcess:
+        out = self.delete_files(files)
+        return out
 
     def exists(self, path: Dir | Remote | str | File) -> bool:
         """Check if a file or directory exists."""
@@ -325,7 +336,7 @@ class Rclone:
 
     def copy_dir(
         self, src: str | Dir, dst: str | Dir, args: list[str] | None = None
-    ) -> subprocess.CompletedProcess:
+    ) -> CompletedProcess:
         """Copy a directory from source to destination."""
         # convert src to str, also dst
         src = convert_to_str(src)
@@ -333,16 +344,19 @@ class Rclone:
         cmd_list: list[str] = ["copy", src, dst]
         if args is not None:
             cmd_list += args
-        return self._run(cmd_list)
+        cp = self._run(cmd_list)
+        return CompletedProcess.from_subprocess(cp)
 
     def copy_remote(
         self, src: Remote, dst: Remote, args: list[str] | None = None
-    ) -> subprocess.CompletedProcess:
+    ) -> CompletedProcess:
         """Copy a remote to another remote."""
         cmd_list: list[str] = ["copy", str(src), str(dst)]
         if args is not None:
             cmd_list += args
-        return self._run(cmd_list)
+        # return self._run(cmd_list)
+        cp = self._run(cmd_list)
+        return CompletedProcess.from_subprocess(cp)
 
     def mount(
         self,

{rclone_api-1.0.36 → rclone_api-1.0.38}/src/rclone_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rclone_api
-Version: 1.0.36
+Version: 1.0.38
 Summary: rclone api in python
 Home-page: https://github.com/zackees/rclone-api
 Maintainer: Zachary Vorhies

{rclone_api-1.0.36 → rclone_api-1.0.38}/src/rclone_api.egg-info/SOURCES.txt

@@ -22,6 +22,7 @@ upload_package.sh
 .vscode/tasks.json
 src/rclone_api/__init__.py
 src/rclone_api/cli.py
+src/rclone_api/completed_process.py
 src/rclone_api/config.py
 src/rclone_api/convert.py
 src/rclone_api/deprecated.py