rclone-api 1.0.49__py2.py3-none-any.whl → 1.0.50__py2.py3-none-any.whl

rclone_api/file.py

@@ -1,47 +1,54 @@
-import json
-
-from rclone_api.rpath import RPath
-
-
-class File:
-    """Remote file dataclass."""
-
-    def __init__(
-        self,
-        path: RPath,
-    ) -> None:
-        self.path = path
-
-    @property
-    def name(self) -> str:
-        return self.path.name
-
-    def read_text(self) -> str:
-        """Read the file contents as bytes.
-
-        Returns:
-            bytes: The file contents
-
-        Raises:
-            RuntimeError: If no rclone instance is associated with this file
-            RuntimeError: If the path represents a directory
-        """
-        if self.path.rclone is None:
-            raise RuntimeError("No rclone instance associated with this file")
-        if self.path.is_dir:
-            raise RuntimeError("Cannot read a directory as bytes")
-
-        result = self.path.rclone._run(["cat", self.path.path], check=True)
-        return result.stdout
-
-    def to_json(self) -> dict:
-        """Convert the File to a JSON serializable dictionary."""
-        return self.path.to_json()
-
-    def __str__(self) -> str:
-        return str(self.path)
-
-    def __repr__(self) -> str:
-        data = self.path.to_json()
-        data_str = json.dumps(data)
-        return data_str
+import json
+
+from rclone_api.rpath import RPath
+
+
+class File:
+    """Remote file dataclass."""
+
+    def __init__(
+        self,
+        path: RPath,
+    ) -> None:
+        self.path = path
+
+    @property
+    def name(self) -> str:
+        return self.path.name
+
+    def read_text(self) -> str:
+        """Read the file contents as bytes.
+
+        Returns:
+            bytes: The file contents
+
+        Raises:
+            RuntimeError: If no rclone instance is associated with this file
+            RuntimeError: If the path represents a directory
+        """
+        if self.path.rclone is None:
+            raise RuntimeError("No rclone instance associated with this file")
+        if self.path.is_dir:
+            raise RuntimeError("Cannot read a directory as bytes")
+
+        result = self.path.rclone._run(["cat", self.path.path], check=True)
+        return result.stdout
+
+    def to_json(self) -> dict:
+        """Convert the File to a JSON serializable dictionary."""
+        return self.path.to_json()
+
+    def to_string(self, include_remote: bool = True) -> str:
+        """Convert the File to a string."""
+        out = str(self.path)
+        if not include_remote:
+            _, out = out.split(":", 1)
+        return out
+
+    def __str__(self) -> str:
+        return str(self.path)
+
+    def __repr__(self) -> str:
+        data = self.path.to_json()
+        data_str = json.dumps(data)
+        return data_str

rclone_api/group_files.py

@@ -112,12 +112,19 @@ def _make_tree(files: list[str]) -> dict[str, TreeNode]:
         parts = parse_file(file)
         remote = parts.remote
         node: TreeNode = tree.setdefault(remote, TreeNode(remote))
-        for parent in parts.parents:
-            is_last = parent == parts.parents[-1]
-            node = node.child_nodes.setdefault(parent, TreeNode(parent, parent=node))
-            if is_last:
-                node.files.append(parts.name)
-                node.add_count_bubble_up()
+        if parts.parents:
+            for parent in parts.parents:
+                is_last = parent == parts.parents[-1]
+                node = node.child_nodes.setdefault(
+                    parent, TreeNode(parent, parent=node)
+                )
+                if is_last:
+                    node.files.append(parts.name)
+                    node.add_count_bubble_up()
+        else:
+            node.files.append(parts.name)
+            node.add_count_bubble_up()
+
     return tree
 
 
@@ -134,13 +141,27 @@ def _fixup_rclone_paths(outpaths: dict[str, list[str]]) -> dict[str, list[str]]:
     return out
 
 
-def group_files(files: list[str]) -> dict[str, list[str]]:
+def group_files(files: list[str], fully_qualified: bool = True) -> dict[str, list[str]]:
     """split between filename and parent directory path"""
+    if fully_qualified is False:
+        for i, file in enumerate(files):
+            file = "root:" + file
+            files[i] = file
     tree: dict[str, TreeNode] = _make_tree(files)
     outpaths: dict[str, list[str]] = {}
     for _, node in tree.items():
         _merge(node, "", outpaths)
-    out: dict[str, list[str]] = _fixup_rclone_paths(outpaths=outpaths)
+    tmp: dict[str, list[str]] = _fixup_rclone_paths(outpaths=outpaths)
+    out: dict[str, list[str]] = {}
+    if fully_qualified is False:
+        for path, files in tmp.items():
+            if path.startswith("root"):
+                path = path.replace("root", "")
+                if path.startswith(":"):
+                    path = path[1:]
+            out[path] = [file.replace("/root/", "") for file in files]
+    else:
+        out = tmp
     return out