kaparoo-python 0.1.6__py3-none-any.whl → 0.1.8__py3-none-any.whl

kaparoo/__about__.py

@@ -1 +1 @@
-__version__ = "0.1.6"
+__version__ = "0.1.8"

kaparoo/filesystem/__init__.py

@@ -1,10 +1,4 @@
 __all__ = (
-    # exceptions
-    "DirectoryNotFoundError",
-    "NotAFileError",
-    # types
-    "StrPath",
-    "StrPaths",
     # utils
     "prepend_path",
     "prepend_paths",
@@ -30,11 +24,8 @@ __all__ = (
     "get_files",
     "get_paths",
     "make_dirs",
-    # collections
-    "DataFolder",
 )
 
-from kaparoo.filesystem.collections import DataFolder
 from kaparoo.filesystem.directory import (
     dir_empty,
     dirs_empty,
@@ -43,10 +34,6 @@ from kaparoo.filesystem.directory import (
     get_paths,
     make_dirs,
 )
-from kaparoo.filesystem.exceptions import (
-    DirectoryNotFoundError,
-    NotAFileError,
-)
 from kaparoo.filesystem.existence import (
     dir_exists,
     dirs_exist,
@@ -61,7 +48,6 @@ from kaparoo.filesystem.existence import (
     path_exists,
     paths_exist,
 )
-from kaparoo.filesystem.types import StrPath, StrPaths
 from kaparoo.filesystem.utils import (
     prepend_path,
     prepend_paths,

kaparoo/filesystem/collections.py

@@ -1,27 +1,28 @@
 from __future__ import annotations
 
-__all__ = ("DataFolder",)
+__all__ = ("DataSequence", "DataFilesFolder", "UnifiedDataFile", "UnifiedDataFolder")
 
 from abc import abstractmethod
 from collections.abc import Sequence
 from typing import TYPE_CHECKING, overload
 
-from kaparoo.filesystem.existence import ensure_dir_exists
+from kaparoo.filesystem.existence import ensure_dir_exists, ensure_file_exists
 from kaparoo.utils.types import T_co
 
 if TYPE_CHECKING:
-    from typing import Self
+    from typing import Any, Self
 
     from kaparoo.filesystem.types import StrPath, StrPaths
 
 
-class DataFolder(Sequence[T_co]):
-    def __init__(self: Self, path: StrPath) -> None:
-        self.path = ensure_dir_exists(path)
-        self.files = self.list_files(self.path)
+class DataSequence(Sequence[T_co]):
+    @abstractmethod
+    def __init__(self: Self, path: StrPath, *args: Any, **kwargs: Any) -> None:
+        raise NotImplementedError
 
+    @abstractmethod
     def __len__(self: Self) -> int:
-        return len(self.files)
+        raise NotImplementedError
 
     @overload
     def __getitem__(self: Self, index: int, /) -> T_co:
@@ -34,21 +35,36 @@ class DataFolder(Sequence[T_co]):
     def __getitem__(self: Self, index: int | slice, /) -> T_co | Sequence[T_co]:
         if isinstance(index, slice):
             start, stop, step = index.indices(len(self))
-            return self.parse_files(range(start, stop, step))
-        return self.parse_file(index)
+            return self.by_indices(range(start, stop, step))
+        return self.by_index(index)
 
     @abstractmethod
-    def parse_file(self: Self, index: int) -> T_co:
+    def by_index(self: Self, index: int) -> T_co:
         raise NotImplementedError
 
-    def parse_files(self: Self, indices: Sequence[int]) -> Sequence[T_co]:
-        return [self.parse_file(i) for i in indices]
+    def by_indices(self: Self, indices: Sequence[int]) -> Sequence[T_co]:
+        return [self.by_index(index) for index in indices]
+
+
+class DataFilesFolder(DataSequence[T_co]):
+    def __init__(self: Self, path: StrPath, *args: Any, **kwargs: Any) -> None:
+        self.path = ensure_dir_exists(path)
+        self.files = self.list_files(*args, **kwargs)
+
+    def __len__(self: Self) -> int:
+        return len(self.files)
 
     @classmethod
     @abstractmethod
-    def list_files(cls: type[Self], path: StrPath) -> StrPaths:
+    def list_files(cls: type[Self], *args: Any, **kwargs: Any) -> StrPaths:
         raise NotImplementedError
 
-    def refresh(self: Self) -> None:
-        """Refresh the list of files."""
-        self.files = self.list_files(self.path)
+
+class UnifiedDataFile(DataSequence[T_co]):
+    def __init__(self: Self, path: StrPath, *args: Any, **kwargs: Any) -> None:
+        self.path = ensure_file_exists(path)
+
+
+class UnifiedDataFolder(DataFilesFolder[T_co]):
+    def __init__(self: Self, path: StrPath, *args: Any, **kwargs: Any) -> None:
+        self.path = ensure_dir_exists(path)

kaparoo/filesystem/directory.py

@@ -213,18 +213,12 @@ def get_paths(
 
     paths = list(root.rglob(pattern) if recursive else root.glob(pattern))
 
-    if root in paths:
-        paths.remove(root)
-
-    if not excludes:
-        excludes = []
-
-    for exclude in excludes:
-        path_exclude = Path(exclude)
-        if not path_exclude.is_relative_to(root):
-            path_exclude = root / path_exclude
-        if path_exclude in paths:
-            paths.remove(path_exclude)
+    excludes_set = {root}
+    if excludes:
+        resolve = lambda p: p if p.is_relative_to(root) else root / p  # noqa: E731
+        excludes_set.update(resolve(Path(e)) for e in excludes)
+
+    paths = [p for p in paths if p not in excludes_set]
 
     if callable(condition):
         paths = [p for p in paths if condition(p)]

{kaparoo_python-0.1.6.dist-info → kaparoo_python-0.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kaparoo-python
-Version: 0.1.6
+Version: 0.1.8
 Summary: Personally common and useful Python features
 Project-URL: GitHub, https://www.github.com/kaparoo/kaparoo-python
 Author-email: Jaewoo Park <kaparoo2001@gmail.com>
@@ -37,11 +37,11 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Typing :: Typed
 Requires-Python: >=3.11
 Provides-Extra: dev
-Requires-Dist: hatch>=1.9.1; extra == 'dev'
+Requires-Dist: hatch>=1.9.3; extra == 'dev'
 Requires-Dist: mypy>=1.8.0; extra == 'dev'
 Requires-Dist: pytest-order>=1.2.0; extra == 'dev'
-Requires-Dist: pytest>=7.4.4; extra == 'dev'
-Requires-Dist: ruff>=0.1.13; extra == 'dev'
+Requires-Dist: pytest>=8.0.0; extra == 'dev'
+Requires-Dist: ruff>=0.2.1; extra == 'dev'
 Description-Content-Type: text/markdown
 
 # **kaparoo-python**

{kaparoo_python-0.1.6.dist-info → kaparoo_python-0.1.8.dist-info}/RECORD

@@ -1,9 +1,9 @@
-kaparoo/__about__.py,sha256=js_m8PQ2W0sqE2u8EbnwOj4Lf2mj4pZf8gFa9fJIYQQ,23
+kaparoo/__about__.py,sha256=0xngvyws52ELzKEHKt7iPFCbLG7K2r7U7qtbX9gCyQM,23
 kaparoo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kaparoo/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kaparoo/filesystem/__init__.py,sha256=wAZKtPz9Djwzx1EVYiKryjVobhywADKpRYiYjJoHKhI,1473
-kaparoo/filesystem/collections.py,sha256=THI8uqXxcde9BhLP9aUajo1niLcCv1B0ZNs0BppRXq8,1636
-kaparoo/filesystem/directory.py,sha256=QGrJENGXDtkt1cCNDRZHiIdGBbKLv4xhH5S1QdEX4VI,13174
+kaparoo/filesystem/__init__.py,sha256=GYaV82lgd9T52hMtnaC-D4oCR625lEoUW-W0d7R3b_k,1110
+kaparoo/filesystem/collections.py,sha256=SNIg0DcI0sQlDoGV_HtnXCFkQneMQT_Z4AKc7Vy9VLs,2271
+kaparoo/filesystem/directory.py,sha256=ZYYDKebQdCmGLLNKHiHpMJ4bSpn-YLyU412KuS9ThZI,13086
 kaparoo/filesystem/exceptions.py,sha256=Bb9PnDMja24QfHIE2pKAfSqcdHInukgeTnGciM5xO7o,468
 kaparoo/filesystem/existence.py,sha256=5_W4yDbd632HpG5kOPxwvQ01D50LNZmjmCis1JIsOxY,12391
 kaparoo/filesystem/types.py,sha256=rGI8Zbdi-CS8LlFeF0fc60wHob75Gx2KvJ6mctPA2wk,215
@@ -11,7 +11,7 @@ kaparoo/filesystem/utils.py,sha256=a0qYVvRl17sPOVfq_wgjO86-8B4jB8sfj-rsSaQWTO8,4
 kaparoo/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kaparoo/utils/optional.py,sha256=Leb_8f5kSxRvBnEDrMfbXshJm1Bdc1lMH26xcqvUiaY,4772
 kaparoo/utils/types.py,sha256=orqC307c1fCrhdCp4iY011P8yVoXexB2Fnmb29_pWXU,194
-kaparoo_python-0.1.6.dist-info/METADATA,sha256=5YfWWCuNqecxbFe5HZyv64nwXYhxcPsNzK4VEkplmjs,3097
-kaparoo_python-0.1.6.dist-info/WHEEL,sha256=mRYSEL3Ih6g5a_CVMIcwiF__0Ae4_gLYh01YFNwiq1k,87
-kaparoo_python-0.1.6.dist-info/licenses/LICENSE,sha256=_6aA_CoB_YWkSfqkGFxghm2GIsBRE2rp_g7vhz11DM8,1087
-kaparoo_python-0.1.6.dist-info/RECORD,,
+kaparoo_python-0.1.8.dist-info/METADATA,sha256=oih8mN5qg3u1-TokE7oUehSsSrJbNht5olSDTPnjWRg,3096
+kaparoo_python-0.1.8.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
+kaparoo_python-0.1.8.dist-info/licenses/LICENSE,sha256=_6aA_CoB_YWkSfqkGFxghm2GIsBRE2rp_g7vhz11DM8,1087
+kaparoo_python-0.1.8.dist-info/RECORD,,

{kaparoo_python-0.1.6.dist-info → kaparoo_python-0.1.8.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.21.0
+Generator: hatchling 1.21.1
 Root-Is-Purelib: true
 Tag: py3-none-any