rclone-api 1.0.77__tar.gz → 1.0.79__tar.gz

{rclone_api-1.0.77 → rclone_api-1.0.79}/PKG-INFO

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

{rclone_api-1.0.77 → rclone_api-1.0.79}/pyproject.toml

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

{rclone_api-1.0.77 → rclone_api-1.0.79}/src/rclone_api/__init__.py

@@ -9,7 +9,7 @@ from .process import Process
 from .rclone import Rclone, rclone_verbose
 from .remote import Remote
 from .rpath import RPath
-from .types import GroupingOption, ListingOption, Order, SizeResult
+from .types import ListingOption, Order, SizeResult
 
 __all__ = [
     "Rclone",
@@ -29,6 +29,5 @@ __all__ = [
     "ListingOption",
     "Order",
     "ListingOption",
-    "GroupingOption",
     "SizeResult",
 ]

{rclone_api-1.0.77 → rclone_api-1.0.79}/src/rclone_api/dir_listing.py

@@ -29,6 +29,16 @@ class DirListing:
         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]
 
+    def files_relative(self, prefix: str) -> list[str]:
+        """Return a list of file paths relative to the root directory."""
+        from rclone_api.file import File
+
+        out: list[str] = []
+        f: File
+        for f in self.files:
+            out.append(f.relative_to(prefix))
+        return out
+
     def __str__(self) -> str:
         n_files = len(self.files)
         n_dirs = len(self.dirs)

{rclone_api-1.0.77 → rclone_api-1.0.79}/src/rclone_api/file.py

@@ -1,4 +1,5 @@
 import json
+from pathlib import Path
 
 from rclone_api.rpath import RPath
 
@@ -47,6 +48,12 @@ class File:
             return f"{remote.name}:{rest}"
         return rest
 
+    def relative_to(self, prefix: str) -> str:
+        """Return the relative path to the other directory."""
+        self_path = Path(str(self))
+        rel_path = self_path.relative_to(prefix)
+        return str(rel_path.as_posix())
+
     @property
     def size(self) -> int:
         """Get the size of the file."""

{rclone_api-1.0.77 → rclone_api-1.0.79}/src/rclone_api/group_files.py

@@ -182,6 +182,9 @@ def group_under_remote(
     files: list[str], fully_qualified: bool = True
 ) -> dict[str, list[str]]:
     """split between filename and remote"""
+
+    #### DOE STHIS NEED TO BE REMOVEDD????? #####
+
     assert fully_qualified is True, "Not implemented for fully_qualified=False"
     out: dict[str, list[str]] = {}
     for file in files:

{rclone_api-1.0.77 → rclone_api-1.0.79}/src/rclone_api/rclone.py

@@ -24,14 +24,11 @@ from rclone_api.exec import RcloneExec
 from rclone_api.file import File
 from rclone_api.group_files import (
     group_files,
-    group_under_remote,
-    group_under_remote_bucket,
 )
 from rclone_api.process import Process
 from rclone_api.remote import Remote
 from rclone_api.rpath import RPath
 from rclone_api.types import (
-    GroupingOption,
     ListingOption,
     ModTimeStrategy,
     Order,
@@ -840,54 +837,50 @@ class Rclone:
 
     def size_files(
         self,
+        src: str,
         files: list[str],
         fast_list: bool = True,
         other_args: list[str] | None = None,
-        grouping: GroupingOption = GroupingOption.BUCKET,
         check: bool | None = False,
         verbose: bool | None = None,
     ) -> SizeResult:
         """Get the size of a list of files. Example of files items: "remote:bucket/to/file"."""
         verbose = get_verbose(verbose)
         check = get_check(check)
-        file_list: dict[str, list[str]]
-        if grouping == GroupingOption.BUCKET:
-            file_list = group_under_remote_bucket(files)
-        elif grouping == GroupingOption.REMOTE:
-            file_list = group_under_remote(files)
+        files = list(files)
         all_files: list[File] = []
-        for src_path, files in file_list.items():
-            cmd = ["lsjson", src_path, "--files-only", "-R"]
-            with TemporaryDirectory() as tmpdir:
-                # print("files: " + ",".join(files))
-                include_files_txt = Path(tmpdir) / "include_files.txt"
-                include_files_txt.write_text("\n".join(files), encoding="utf-8")
-                cmd += ["--files-from", str(include_files_txt)]
-                if fast_list:
-                    cmd.append("--fast-list")
-                if other_args:
-                    cmd += other_args
-                cp = self._run(cmd, check=check)
 
-                if cp.returncode != 0:
-                    if check:
-                        raise ValueError(f"Error getting file sizes: {cp.stderr}")
-                    else:
-                        warnings.warn(f"Error getting file sizes: {cp.stderr}")
-                stdout = cp.stdout
-                pieces = src_path.split(":", 1)
-                remote_name = pieces[0]
-                parent_path: str | None
-                if len(pieces) > 1:
-                    parent_path = pieces[1]
+        cmd = ["lsjson", src, "--files-only", "-R"]
+        with TemporaryDirectory() as tmpdir:
+            # print("files: " + ",".join(files))
+            include_files_txt = Path(tmpdir) / "include_files.txt"
+            include_files_txt.write_text("\n".join(files), encoding="utf-8")
+            cmd += ["--files-from", str(include_files_txt)]
+            if fast_list:
+                cmd.append("--fast-list")
+            if other_args:
+                cmd += other_args
+            cp = self._run(cmd, check=check)
+
+            if cp.returncode != 0:
+                if check:
+                    raise ValueError(f"Error getting file sizes: {cp.stderr}")
                 else:
-                    parent_path = None
-                remote = Remote(name=remote_name, rclone=self)
-                paths: list[RPath] = RPath.from_json_str(
-                    stdout, remote, parent_path=parent_path
-                )
-                # print(paths)
-                all_files += [File(p) for p in paths]
+                    warnings.warn(f"Error getting file sizes: {cp.stderr}")
+            stdout = cp.stdout
+            pieces = src.split(":", 1)
+            remote_name = pieces[0]
+            parent_path: str | None
+            if len(pieces) > 1:
+                parent_path = pieces[1]
+            else:
+                parent_path = None
+            remote = Remote(name=remote_name, rclone=self)
+            paths: list[RPath] = RPath.from_json_str(
+                stdout, remote, parent_path=parent_path
+            )
+            # print(paths)
+            all_files += [File(p) for p in paths]
         file_sizes: dict[str, int] = {}
         f: File
         for f in all_files:
@@ -900,5 +893,13 @@ class Rclone:
                 warnings.warn(f"File size is 0: {p}")
             file_sizes[p] = f.size
         total_size = sum(file_sizes.values())
-        out: SizeResult = SizeResult(total_size=total_size, file_sizes=file_sizes)
+        file_sizes_path_corrected: dict[str, int] = {}
+        for path, size in file_sizes.items():
+            # remove the prefix
+            path_path = Path(path)
+            path_str = path_path.relative_to(src).as_posix()
+            file_sizes_path_corrected[path_str] = size
+        out: SizeResult = SizeResult(
+            prefix=src, total_size=total_size, file_sizes=file_sizes_path_corrected
+        )
         return out

{rclone_api-1.0.77 → rclone_api-1.0.79}/src/rclone_api/types.py

@@ -19,14 +19,15 @@ class Order(Enum):
     RANDOM = "random"
 
 
-class GroupingOption(Enum):
-    BUCKET = "bucket"
-    REMOTE = "remote"
+# class GroupingOption(Enum):
+#     BUCKET = "bucket"
+#     REMOTE = "remote"
 
 
 @dataclass
 class SizeResult:
     """Size result dataclass."""
 
+    prefix: str
     total_size: int
     file_sizes: dict[str, int]

{rclone_api-1.0.77 → rclone_api-1.0.79}/src/rclone_api.egg-info/PKG-INFO

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

{rclone_api-1.0.77 → rclone_api-1.0.79}/tests/test_size_files.py

@@ -61,7 +61,8 @@ class RcloneSizeFilesTester(unittest.TestCase):
         dirlisting: DirListing
         is_first = True
         files: list[str] = []
-        for dirlisting in rclone.walk(f"dst:{BUCKET_NAME}", max_depth=1):
+        src = f"dst:{BUCKET_NAME}"
+        for dirlisting in rclone.walk(src, max_depth=1):
             if is_first:
                 # assert just one file
                 # assert len(dirlisting.files) == 1
@@ -70,12 +71,12 @@ class RcloneSizeFilesTester(unittest.TestCase):
                 self.assertEqual(dirlisting.files[0].name, "first.txt")
                 is_first = False
             # print(dirlisting)
-            for file in dirlisting.files:
-                files.append(str(file))
+            for file in dirlisting.files_relative(src):
+                files.append(file)
 
         # print(files)
 
-        size_map: SizeResult = rclone.size_files(files, check=True)
+        size_map: SizeResult = rclone.size_files(src=src, files=files, check=True)
         print(size_map)
         print("done")