kisstdlib 0.0.10__tar.gz → 0.0.11__tar.gz

{kisstdlib-0.0.10 → kisstdlib-0.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: kisstdlib
-Version: 0.0.10
+Version: 0.0.11
 Summary: System programming with conceptually and algebraically simple primitives.
 Author-email: Jan Malakhovski <oxij@oxij.org>
 Project-URL: Homepage, https://oxij.org/software/kisstdlib/

{kisstdlib-0.0.10 → kisstdlib-0.0.11}/kisstdlib/argparse_ext.py

@@ -194,38 +194,6 @@ class _OptionallyMarkdownHelpAction(Action):
         parser.post_parse_args = self.show_help
 
 
-class _StoreMapAction(Action):
-    def __init__(self, func: _t.Callable[[_t.Any], _t.Any] = _identity, **kwargs: _t.Any) -> None:
-        super().__init__(**kwargs)
-        self.func = func
-
-    def __call__(
-        self,
-        parser: _t.Any,
-        namespace: Namespace,
-        values: _t.Any,
-        option_string: str | None = None,
-    ) -> None:
-        setattr(namespace, self.dest, self.func(values))
-
-
-class _AppendMapAction(Action):
-    def __init__(self, func: _t.Callable[[_t.Any], _t.Any] = _identity, **kwargs: _t.Any) -> None:
-        super().__init__(default=[], **kwargs)
-        self.func = func
-
-    def __call__(
-        self,
-        parser: _t.Any,
-        namespace: Namespace,
-        values: _t.Any,
-        option_string: str | None = None,
-    ) -> None:
-        v = getattr(namespace, self.dest)
-        v.append(self.func(values))
-        setattr(namespace, self.dest, v)
-
-
 class BetterArgumentParser(ArgumentParser):
     """Like `argparse.ArgumentParser`, but uses `BetterHelpFormatter` by default,
     and implements `format_help` that recurses into subcommands and appends
@@ -257,8 +225,6 @@ class BetterArgumentParser(ArgumentParser):
             **kwargs,
         )
 
-        self.register("action", "store_map", _StoreMapAction)
-        self.register("action", "append_map", _AppendMapAction)
         self.register("action", "help_omd", _OptionallyMarkdownHelpAction)
 
         self.add_version = add_version

{kisstdlib-0.0.10 → kisstdlib-0.0.11}/kisstdlib/fs.py

@@ -61,6 +61,16 @@ def dirname_dot(path: _t.AnyStr) -> tuple[_t.AnyStr, bool]:
     return path, True
 
 
+def realdir(path: _t.AnyStr, strict: bool = False) -> _t.AnyStr:
+    """Apply `os.path.realpath` to the `dirname` part of `path`.
+
+    Essentially, this returns the canonical path of the inode the `path` points to, even when that
+    inode is a symlink.
+    """
+    dn, bn = _op.split(path)
+    return _op.join(_op.realpath(dn, strict=strict), bn)
+
+
 def read_file_maybe(path: str | bytes) -> bytes | None:
     """Return contents of the given file path, or `None` if it does not exist."""
     try:
@@ -192,7 +202,7 @@ def iter_subtree(
             fstat = _os.stat(path, follow_symlinks=follow_symlinks)
         except OSError as exc:
             if handle_error is not None:
-                eno = exc.errno
+                eno = exc.errno or 0
                 handle_error(
                     "failed to `stat`: [Errno %d, %s] %s: %s",
                     eno,
@@ -218,7 +228,7 @@ def iter_subtree(
         scandir_it = _os.scandir(path)
     except OSError as exc:
         if handle_error is not None:
-            eno = exc.errno
+            eno = exc.errno or 0
             handle_error(
                 "failed to `scandir`: [Errno %d, %s] %s: %s",
                 eno,
@@ -240,7 +250,7 @@ def iter_subtree(
                 break
             except OSError as exc:
                 if handle_error is not None:
-                    eno = exc.errno
+                    eno = exc.errno or 0
                     handle_error(
                         "failed in `scandir`: [Errno %d, %s] %s: %s",
                         eno,
@@ -255,7 +265,7 @@ def iter_subtree(
                     entry_is_dir = entry.is_dir(follow_symlinks=follow_symlinks)
                 except OSError as exc:
                     if handle_error is not None:
-                        eno = exc.errno
+                        eno = exc.errno or 0
                         handle_error(
                             "failed to `stat`: [Errno %d, %s] %s: %s",
                             eno,
@@ -398,7 +408,7 @@ def describe_forest(
     """Produce a simple `find .`+`stat`-like description of walks of given `paths`.
     See `describe-forest` script for more info.
     """
-    escape: _t.Callable[[str], str] = _identity if literal else _escape_path  # type: ignore
+    escape: _t.Callable[[str], str] = _identity if literal else _escape_path
     seen: dict[tuple[int, int], tuple[_t.AnyStr, int, str]] = {}
     for i, dirpath in enumerate(paths):
         for fpath, _eps, _edir in iter_subtree(dirpath, follow_symlinks=follow_symlinks):
@@ -1100,6 +1110,6 @@ def setup_fs(prog: str | None = None, ext: str = ".part", add_pid: bool = True)
         prog = _op.basename(_sys.argv[0])
 
     global _dot_part, _dot_partb
-    pid = f"_{_os.getpid()}" if add_pid else ""
-    _dot_part = f".{prog}{pid}{ext}"
+    pid = f"{_os.getpid()}." if add_pid else ""
+    _dot_part = f".{pid}{prog}{ext}"
     _dot_partb = _dot_part.encode("ascii")

kisstdlib-0.0.11/kisstdlib/io/adapter.py

@@ -0,0 +1,140 @@
+# Copyright (c) 2018-2025 Jan Malakhovski <oxij@oxij.org>
+#
+# This file is a part of `kisstdlib` project.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+"""Adapt almost any folding function into `IOBase` interface."""
+
+import typing as _t
+from zlib import compressobj as _compressobj, decompressobj as _decompressobj
+
+
+class IOAdapter:
+    def __init__(self, fobj: _t.Any) -> None:
+        self._fobj = fobj
+
+    def close(self) -> None:
+        self._fobj.close()
+
+    def flush(self) -> None:
+        self._fobj.flush()
+
+    def __enter__(self) -> _t.Any:
+        return self
+
+    def __exit__(self, exc_type: _t.Any, exc_value: _t.Any, exc_tb: _t.Any) -> None:
+        self.close()
+
+    def fileno(self) -> int:
+        return self._fobj.fileno()  # type: ignore
+
+    @property
+    def closed(self) -> bool:
+        return self._fobj.closed  # type: ignore
+
+
+class ReadAdapter(IOAdapter):
+    def __init__(self, fobj: _t.Any, block_size: int) -> None:
+        super().__init__(fobj)
+        self._block_size = block_size
+        self._buffer = b""
+        self._eof = False
+
+    def _handle_eof(self) -> bytes:
+        raise NotImplementedError()
+
+    def _handle_data(self, data: bytes) -> bytes:
+        raise NotImplementedError()
+
+    def read(self, size: int = -1) -> bytes:
+        while not self._eof and (size == -1 or len(self._buffer) < size):
+            data = self._fobj.read(self._block_size)
+            if len(data) == 0:
+                self._buffer += self._handle_eof()
+                self._eof = True
+            else:
+                self._buffer += self._handle_data(data)
+
+        if len(self._buffer) == 0:
+            return b""
+
+        if size == -1 or len(self._buffer) == size:
+            res = self._buffer
+            self._buffer = b""
+            return res
+
+        res = self._buffer[:size]
+        self._buffer = self._buffer[len(res) :]
+        return res
+
+    def tell(self) -> int:
+        return self._fobj.tell()  # type: ignore
+
+
+class UpdateFinalizeReader(ReadAdapter):
+    def __init__(self, preprocessor: _t.Any, fobj: _t.Any, block_size: int) -> None:
+        super().__init__(fobj, block_size)
+        self._preprocessor = preprocessor
+
+    def _handle_eof(self) -> bytes:
+        return self._preprocessor.finalize()  # type: ignore
+
+    def _handle_data(self, data: bytes) -> bytes:
+        return self._preprocessor.update(data)  # type: ignore
+
+
+class UpdateFinalizeWriter(IOAdapter):
+    def __init__(self, fobj: _t.Any, preprocessor: _t.Any) -> None:
+        super().__init__(fobj)
+        self._preprocessor = preprocessor
+
+    def write(self, data: bytes) -> None:
+        self._fobj.write(self._preprocessor.update(data))
+
+    def close(self) -> None:
+        if not self.closed:
+            self._fobj.write(self._preprocessor.finalize())
+            self._fobj.close()
+
+
+class ZlibDecompressor(ReadAdapter):
+    def __init__(self, fobj: _t.Any, block_size: int, **kwargs: _t.Any) -> None:
+        super().__init__(fobj, block_size)
+        self._decompressor = _decompressobj(**kwargs)
+
+    def _handle_eof(self) -> bytes:
+        return self._decompressor.flush()
+
+    def _handle_data(self, data: bytes) -> bytes:
+        return self._decompressor.decompress(data)
+
+
+class ZlibCompressor(IOAdapter):
+    def __init__(self, fobj: _t.Any, **kwargs: _t.Any) -> None:
+        super().__init__(fobj)
+        self._compressor = _compressobj(**kwargs)
+
+    def write(self, data: bytes) -> None:
+        self._fobj.write(self._compressor.compress(data))
+
+    def close(self) -> None:
+        if not self.closed:
+            self._fobj.write(self._compressor.flush())
+            self._fobj.close()

{kisstdlib-0.0.10 → kisstdlib-0.0.11}/kisstdlib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: kisstdlib
-Version: 0.0.10
+Version: 0.0.11
 Summary: System programming with conceptually and algebraically simple primitives.
 Author-email: Jan Malakhovski <oxij@oxij.org>
 Project-URL: Homepage, https://oxij.org/software/kisstdlib/

{kisstdlib-0.0.10 → kisstdlib-0.0.11}/kisstdlib.egg-info/SOURCES.txt

@@ -27,6 +27,7 @@ kisstdlib.egg-info/entry_points.txt
 kisstdlib.egg-info/requires.txt
 kisstdlib.egg-info/top_level.txt
 kisstdlib/io/__init__.py
+kisstdlib/io/adapter.py
 kisstdlib/io/base.py
 kisstdlib/io/encoder.py
 kisstdlib/io/stdio.py

{kisstdlib-0.0.10 → kisstdlib-0.0.11}/pyproject.toml

@@ -9,7 +9,7 @@ namespaces = true
 "kisstdlib" = ["py.typed"]
 [project]
 name = "kisstdlib"
-version = "0.0.10"
+version = "0.0.11"
 authors = [{ name = "Jan Malakhovski", email = "oxij@oxij.org" }]
 description = "System programming with conceptually and algebraically simple primitives."
 readme = "README.md"