rclone-api 1.5.36__py3-none-any.whl → 1.5.37__py3-none-any.whl

rclone_api/fs.py

@@ -31,7 +31,8 @@ class FS(abc.ABC):
         pass
 
     @abc.abstractmethod
-    def ls(self, path: Path | str) -> list[str]:
+    def ls(self, path: Path | str) -> tuple[list[str], list[str]]:
+        """First is files and second is directories."""
         pass
 
     @abc.abstractmethod
@@ -57,8 +58,11 @@ class RealFS(FS):
     def __init__(self) -> None:
         super().__init__()
 
-    def ls(self, path: Path | str) -> list[str]:
-        return [str(p) for p in Path(path).iterdir()]
+    def ls(self, path: Path | str) -> tuple[list[str], list[str]]:
+        files_and_dirs = [str(p) for p in Path(path).iterdir()]
+        files = [f for f in files_and_dirs if Path(f).is_file()]
+        dirs = [d for d in files_and_dirs if Path(d).is_dir()]
+        return files, dirs
 
     def cwd(self) -> "FSPath":
         return RealFS.from_path(Path.cwd())
@@ -176,7 +180,7 @@ class RemoteFS(FS):
         # Make faster.
         return isinstance(err, Exception) and self.exists(path)
 
-    def ls(self, path: Path | str) -> list[str]:
+    def ls(self, path: Path | str) -> tuple[list[str], list[str]]:
         from rclone_api.http_server import HttpServer
 
         assert isinstance(self.server, HttpServer)
@@ -259,13 +263,17 @@ class FSPath:
         assert isinstance(self.fs, RealFS)
         shutil.rmtree(self.path, ignore_errors=ignore_errors)
 
-    def lspaths(self) -> "list[FSPath]":
-        names: list[str] = self.ls()
-        return [self / name for name in names]
-
-    def ls(self) -> list[str]:
-        names: list[str] = self.fs.ls(self.path)
-        return names
+    def lspaths(self) -> "tuple[list[FSPath], list[FSPath]]":
+        filenames, dirnames = self.ls()
+        fpaths: list[FSPath] = [self / name for name in filenames]
+        dpaths: list[FSPath] = [self / name for name in dirnames]
+        return fpaths, dpaths
+
+    def ls(self) -> tuple[list[str], list[str]]:
+        filenames: list[str]
+        dirnames: list[str]
+        filenames, dirnames = self.fs.ls(self.path)
+        return filenames, dirnames
 
     @property
     def name(self) -> str:

rclone_api/http_server.py

@@ -6,6 +6,7 @@ import tempfile
 import time
 import warnings
 from concurrent.futures import Future, ThreadPoolExecutor
+from dataclasses import dataclass
 from pathlib import Path
 from threading import Semaphore
 from typing import Any
@@ -24,9 +25,16 @@ _PUT_WARNED = False
 _range = range
 
 
-def _parse_files(html: str) -> list[str]:
+@dataclass
+class FileList:
+    dirs: list[str]
+    files: list[str]
+
+
+def _parse_files_and_dirs(html: str) -> FileList:
     soup = BeautifulSoup(html, "html.parser")
     files = []
+    dirs = []
     # Find each table row with class "file"
     for tr in soup.find_all("tr", class_="file"):
         name_span = tr.find("span", class_="name")  # type: ignore
@@ -38,9 +46,14 @@ def _parse_files(html: str) -> list[str]:
         # Get the text from the <a> tag
         file_name = a_tag.get_text(strip=True)  # type: ignore
         # Skip directories (they end with a slash)
-        if not file_name.endswith("/"):
+        # if not file_name.endswith("/"):
+        #    files.append(file_name)
+        # files.append(file_name)
+        if file_name.endswith("/"):
+            dirs.append(file_name)
+        else:
             files.append(file_name)
-    return files
+    return FileList(dirs=dirs, files=files)
 
 
 class HttpServer:
@@ -125,7 +138,7 @@ class HttpServer:
 
         # curl "http://localhost:5572/?list"
 
-    def list(self, path: str) -> list[str] | Exception:
+    def list(self, path: str) -> tuple[list[str], list[str]] | Exception:
         """List files on the server."""
 
         try:
@@ -136,7 +149,8 @@ class HttpServer:
             url += "/?list"
             response = httpx.get(url, timeout=_TIMEOUT)
             response.raise_for_status()
-            return _parse_files(response.content.decode())
+            files_and_dirs = _parse_files_and_dirs(response.content.decode())
+            return files_and_dirs.dirs, files_and_dirs.files
         except Exception as e:
             warnings.warn(f"Failed to list files on {self.url}: {e}")
             return e

{rclone_api-1.5.36.dist-info → rclone_api-1.5.37.dist-info}/METADATA

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

{rclone_api-1.5.36.dist-info → rclone_api-1.5.37.dist-info}/RECORD

@@ -13,9 +13,9 @@ 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=eCiY6Jw8tVC1Kcfr0334Mj29BpeBNF7OtebAPLZdY-0,8386
+rclone_api/fs.py,sha256=ldXOBsPg5I36FFUrEwFN1KbpVge5C4OywtoRTgBUfVw,8893
 rclone_api/group_files.py,sha256=H92xPW9lQnbNw5KbtZCl00bD6iRh9yRbCuxku4j_3dg,8036
-rclone_api/http_server.py,sha256=P7HQFneQ8f6i4H3_dgYVFS8DJca_GYaxVSBmz7lYC9Y,11704
+rclone_api/http_server.py,sha256=F5_hwvcU8duU8u9oaHOiXpfDrEyOFvk311179UseVh8,12113
 rclone_api/install.py,sha256=Xb1BRn8rQcSpSd4dzmvIOELP2zM2DytUeIZ6jzv738A,2893
 rclone_api/log.py,sha256=VZHM7pNSXip2ZLBKMP7M1u-rp_F7zoafFDuR8CPUoKI,1271
 rclone_api/mount.py,sha256=LZqEhuKZunbWVqmsOIqkkCotaxWJpdFRS1InXveoU5E,1428
@@ -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.36.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.5.36.dist-info/METADATA,sha256=o7YKGtRzxdve9F1m3Y4CXoAsO52zKyk1KWbdw03IGYg,37155
-rclone_api-1.5.36.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-rclone_api-1.5.36.dist-info/entry_points.txt,sha256=fJteOlYVwgX3UbNuL9jJ0zUTuX2O79JFAeNgK7Sw7EQ,255
-rclone_api-1.5.36.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.5.36.dist-info/RECORD,,
+rclone_api-1.5.37.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+rclone_api-1.5.37.dist-info/METADATA,sha256=ICLEVml9U93fTILo5VC6P1CtM5qm7CMri1y3uFrbRTw,37155
+rclone_api-1.5.37.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+rclone_api-1.5.37.dist-info/entry_points.txt,sha256=fJteOlYVwgX3UbNuL9jJ0zUTuX2O79JFAeNgK7Sw7EQ,255
+rclone_api-1.5.37.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
+rclone_api-1.5.37.dist-info/RECORD,,