rclone-api 1.0.5__py2.py3-none-any.whl → 1.0.7__py2.py3-none-any.whl

rclone_api/dir.py

@@ -1,4 +1,4 @@
-from rclone_api.file import File
+from rclone_api.dir_listing import DirListing
 from rclone_api.rpath import RPath
 
 
@@ -8,20 +8,10 @@ class Dir:
     def __init__(self, path: RPath) -> None:
         self.path = path
 
-    def ls(self) -> tuple[list["Dir"], list[File]]:
+    def ls(self) -> DirListing:
         """List files and directories in the given path."""
-        cmd = ["lsjson", "--files-only", "--dirs-only", "--json", str(self.path)]
         assert self.path.rclone is not None
-        cp = self.path.rclone._run(cmd)
-        text = cp.stdout
-        tmp: list[RPath] = RPath.from_json_str(text)
-        for t in tmp:
-            t.set_rclone(self.path.rclone)
-        # dirs = [o for o in out if o.is_dir]
-        # files = [o for o in out if not o.is_dir]
-        dirs = [Dir(p) for p in tmp if p.is_dir]
-        files = [File(p) for p in tmp if not p.is_dir]
-        return dirs, files
+        return self.path.rclone.ls(self.path.path)
 
     def __str__(self) -> str:
         return str(self.path)

rclone_api/dir_listing.py

@@ -1,12 +1,14 @@
-from dataclasses import dataclass
+# from rclone_api.dir import Dir
+# from rclone_api.file import File
+from rclone_api.rpath import RPath
 
-from rclone_api.dir import Dir
-from rclone_api.file import File
 
-
-@dataclass
 class DirListing:
     """Remote file dataclass."""
 
-    dirs: list[Dir]
-    files: list[File]
+    def __init__(self, dirs_and_files: list[RPath]) -> None:
+        from rclone_api.dir import Dir
+        from rclone_api.file import File
+
+        self.dirs: list[Dir] = [Dir(d) for d in dirs_and_files if d.is_dir]
+        self.files: list[File] = [File(f) for f in dirs_and_files if not f.is_dir]

rclone_api/rclone.py

@@ -5,9 +5,7 @@ Unit test file.
 import subprocess
 from pathlib import Path
 
-from rclone_api.dir import Dir
 from rclone_api.dir_listing import DirListing
-from rclone_api.file import File
 from rclone_api.remote import Remote
 from rclone_api.rpath import RPath
 from rclone_api.types import Config, RcloneExec
@@ -46,9 +44,7 @@ class Rclone:
         paths: list[RPath] = RPath.from_json_str(text)
         for o in paths:
             o.set_rclone(self)
-        dirs: list[Dir] = [Dir(o) for o in paths if o.is_dir]
-        files: list[File] = [File(o) for o in paths if not o.is_dir]
-        return DirListing(dirs=dirs, files=files)
+        return DirListing(paths)
 
     def listremotes(self) -> list[Remote]:
         cmd = ["listremotes"]

{rclone_api-1.0.5.dist-info → rclone_api-1.0.7.dist-info}/METADATA

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

{rclone_api-1.0.5.dist-info → rclone_api-1.0.7.dist-info}/RECORD

@@ -1,17 +1,17 @@
 rclone_api/__init__.py,sha256=YH7KQaPwUiJWJiRf0NRKD7XHhMXsxWdXDjt9WLSwdjA,265
 rclone_api/cli.py,sha256=dibfAZIh0kXWsBbfp3onKLjyZXo54mTzDjUdzJlDlWo,231
 rclone_api/config.py,sha256=UujjDNcpwgipgdyFPMhC3zikvlsrurUvvZiwXm5NlPg,471
-rclone_api/dir.py,sha256=H83MhwabdxjBiT_3IHvAgo9taeXq6ZhOKIrpFOZwHnY,896
-rclone_api/dir_listing.py,sha256=N2tEcAx721r1HlV0Cax-sutkLJMW4AAofZMVA-Z_aQQ,206
+rclone_api/dir.py,sha256=gzQ9tvnvtddVWN8GmumoAasP3LtMFh20CVyaMH-HxJk,447
+rclone_api/dir_listing.py,sha256=NWleKHCCRW7_eh9JfRwE6r3QbjmiHD5ZEGQcd2vm4uY,458
 rclone_api/file.py,sha256=409neYPfCUKQX2w7Uw7_D0wR2PtH42srNe9u_nnOLxM,925
-rclone_api/rclone.py,sha256=J7pFhe4mHaN415yFP2k_9jr9UnrEiq3lDaKhefepVfA,2053
+rclone_api/rclone.py,sha256=Q3xwC8m47gBVULWSn2XttIBDl33DtCBopvxcOG5LeEA,1837
 rclone_api/remote.py,sha256=RSD-X2jCnm_hq7K6ovJ_0ugM1OpI0vpECIHHEz16-Fs,173
 rclone_api/rpath.py,sha256=_k59z-O75hAhpPyUSH4glPEoiYtIS3RUQb7ltU9Ianw,2009
 rclone_api/types.py,sha256=Yp15HrjwZonSQhE323R0WP7fA4NWqKjAfM7z3OwHpWI,518
 rclone_api/util.py,sha256=EXnijLLdFHqwoZvHrZdqeM8r6T7ad9-pN7qBN1b0I_g,1465
 rclone_api/assets/example.txt,sha256=lTBovRjiz0_TgtAtbA1C5hNi2ffbqnNPqkKg6UiKCT8,54
-rclone_api-1.0.5.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.0.5.dist-info/METADATA,sha256=hq4p_iOF7VcpnDFFBcQU1G_ANEn4Ui0ei0RAjyTwCLQ,1244
-rclone_api-1.0.5.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
-rclone_api-1.0.5.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.0.5.dist-info/RECORD,,
+rclone_api-1.0.7.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+rclone_api-1.0.7.dist-info/METADATA,sha256=gRqNUEJTfkOc25YPpehD9M9ntNx22hai32FXDVib6fU,1244
+rclone_api-1.0.7.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
+rclone_api-1.0.7.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
+rclone_api-1.0.7.dist-info/RECORD,,