rclone-api 1.0.77__py2.py3-none-any.whl → 1.0.78__py2.py3-none-any.whl

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/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/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/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/rclone.py

@@ -24,14 +24,12 @@ 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,21 +838,22 @@ 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)
+        files = list(files)
+        prefix = src if src.endswith(":") else f"{src}/"
+        if src:
+            files = [f"{prefix}{f}" for f in files]
         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)
+        file_list = group_under_remote_bucket(files)
         all_files: list[File] = []
         for src_path, files in file_list.items():
             cmd = ["lsjson", src_path, "--files-only", "-R"]
@@ -900,5 +899,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(prefix).as_posix()
+            file_sizes_path_corrected[path_str] = size
+        out: SizeResult = SizeResult(
+            prefix=prefix, total_size=total_size, file_sizes=file_sizes_path_corrected
+        )
         return out

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.dist-info → rclone_api-1.0.78.dist-info}/METADATA

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

{rclone_api-1.0.77.dist-info → rclone_api-1.0.78.dist-info}/RECORD

@@ -1,4 +1,4 @@
-rclone_api/__init__.py,sha256=5KkqA2OnclssekOdx9ZdT1fFRlxzhpB9zBvXhpG44Ag,760
+rclone_api/__init__.py,sha256=UH1aIcovOSoiWwubbgBs_fvX3YcMhHnLTYJzLnCPKVs,722
 rclone_api/cli.py,sha256=dibfAZIh0kXWsBbfp3onKLjyZXo54mTzDjUdzJlDlWo,231
 rclone_api/completed_process.py,sha256=_IZ8IWK7DM1_tsbDEkH6wPZ-bbcrgf7A7smls854pmg,1775
 rclone_api/config.py,sha256=tP6cU9DnCCEIRc_KP9HPur1jFLLg2QGFSxNwFm6_MVw,118
@@ -6,24 +6,24 @@ rclone_api/convert.py,sha256=Mx9Qo7zhkOedJd8LdhPvNGHp8znJzOk4f_2KWnoGc78,1012
 rclone_api/deprecated.py,sha256=qWKpnZdYcBK7YQZKuVoWWXDwi-uqiAtbjgPcci_efow,590
 rclone_api/diff.py,sha256=tMoJMAGmLSE6Q_7QhPf6PnCzb840djxMZtDmhc2GlGQ,5227
 rclone_api/dir.py,sha256=i4h7LX5hB_WmVixxDRWL_l1nifvscrdWct_8Wx7wHZc,3540
-rclone_api/dir_listing.py,sha256=9Qqf2SUswrOEkyqmaH23V51I18X6ePiXb9B1vUwRF5o,1571
+rclone_api/dir_listing.py,sha256=GoziW8Sne6FY90MLNcb2aO3aaa3jphB6H8ExYrV0Ryo,1882
 rclone_api/exec.py,sha256=1ovvaMXDEfLiT7BrYZyE85u_yFhEUwUNW3jPOzqknR8,1023
-rclone_api/file.py,sha256=1rrZk_L2mdkgsvhr57dbs89wUaDb2SZBSwJg4e13xrk,1602
+rclone_api/file.py,sha256=EP5yT2dZ0H2p7CY5n0y5k5pHhIliV25pm8KOwBklUTk,1863
 rclone_api/filelist.py,sha256=xbiusvNgaB_b_kQOZoHMJJxn6TWGtPrWd2J042BI28o,767
-rclone_api/group_files.py,sha256=pjZAjy01rh5zQ9fExXHDQ4mxmSClVVp_L_3uUWqrXsE,6939
+rclone_api/group_files.py,sha256=CiD2eRVyBn7_xumU0WvPW1268H3VTSy4m_7ZnOy-abg,6991
 rclone_api/process.py,sha256=RrMfTe0bndmJ6gBK67ioqNvCstJ8aTC8RlGX1XBLlcw,4191
-rclone_api/rclone.py,sha256=ptozXdIK9H3wEjcVBjZLLYh2sU9rTbrAc0SQfvKON-k,32598
+rclone_api/rclone.py,sha256=e-SVNjxEGSvyyDXOv7AnLek7Wjt0NYDfBtvWSOA5F78,32858
 rclone_api/remote.py,sha256=O9WDUFQy9f6oT1HdUbTixK2eg0xtBBm8k4Xl6aa6K00,431
 rclone_api/rpath.py,sha256=8ZA_1wxWtskwcy0I8V2VbjKDmzPkiWd8Q2JQSvh-sYE,2586
 rclone_api/scan_missing_folders.py,sha256=Kulca2Q6WZodt00ATFHkmqqInuoPvBkhTcS9703y6po,4740
-rclone_api/types.py,sha256=yysVEP4xxmYWl5DoLoRzBFaMgmJXFxRvQF34FqMtxGE,545
+rclone_api/types.py,sha256=9-qY0Z1NFwiIrvV3e4Ty-dVfed1I_482jPohJ-2hs-o,567
 rclone_api/util.py,sha256=XMrA2m_di4h8JTM-qyx2iyrFZn-l-or_SJOa5tEsDsI,4200
 rclone_api/walk.py,sha256=-54NVE8EJcCstwDoaC_UtHm73R2HrZwVwQmsnv55xNU,3369
 rclone_api/assets/example.txt,sha256=lTBovRjiz0_TgtAtbA1C5hNi2ffbqnNPqkKg6UiKCT8,54
 rclone_api/cmd/list_files.py,sha256=x8FHODEilwKqwdiU1jdkeJbLwOqUkUQuDWPo2u_zpf0,741
-rclone_api-1.0.77.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.0.77.dist-info/METADATA,sha256=8SsedCvu64dTTGi_C-uaTKrDOnKZ5NMzUM9y1WvzoAE,4489
-rclone_api-1.0.77.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
-rclone_api-1.0.77.dist-info/entry_points.txt,sha256=XUoTX3m7CWxdj2VAKhEuO0NMOfX2qf-OcEDFwdyk9ZE,72
-rclone_api-1.0.77.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.0.77.dist-info/RECORD,,
+rclone_api-1.0.78.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+rclone_api-1.0.78.dist-info/METADATA,sha256=DRNqEuwtsDKLk4yejLHUugWmD2oKBCSUGBxwZmSmYMw,4489
+rclone_api-1.0.78.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
+rclone_api-1.0.78.dist-info/entry_points.txt,sha256=XUoTX3m7CWxdj2VAKhEuO0NMOfX2qf-OcEDFwdyk9ZE,72
+rclone_api-1.0.78.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
+rclone_api-1.0.78.dist-info/RECORD,,