yd-cli 0.3__tar.gz → 0.5__tar.gz

{yd_cli-0.3 → yd_cli-0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yd-cli
-Version: 0.3
+Version: 0.5
 Summary: CLI tool to synchronize directories using rsync.
 Author: Christian Heinze
 License-Expression: MIT
@@ -18,7 +18,7 @@ Requires-Dist: msgspec>=0.20
 Requires-Dist: rich>=14.3
 Requires-Dist: typer>=0.24
 Requires-Python: >=3.14
-Project-URL: Repository, https://codeberg.org/christianheinze/syf
+Project-URL: Repository, https://codeberg.org/christianheinze/yd-cli
 Description-Content-Type: text/markdown
 
 # Directory synchronization tool `yd`

{yd_cli-0.3 → yd_cli-0.5}/pyproject.toml

@@ -4,7 +4,7 @@ requires = [ "uv-build>=0.10,<0.12" ]
 
 [project]
 name = "yd-cli"
-version = "0.3"
+version = "0.5"
 description = "CLI tool to synchronize directories using rsync."
 readme = "README.md"
 license = "MIT"
@@ -27,7 +27,7 @@ dependencies = [
     "rich>=14.3",
     "typer>=0.24",
 ]
-urls.Repository = "https://codeberg.org/christianheinze/syf"
+urls.Repository = "https://codeberg.org/christianheinze/yd-cli"
 scripts.yd = "yd.cli:app"
 
 [dependency-groups]
@@ -57,7 +57,7 @@ lint = [
 
 [tool.uv]
 # Suggestion from https://mkennedy.codes/posts/python-supply-chain-security-made-easy/
-build-backend.exclude-newer = "72 hours"
+exclude-newer = "72 hours"
 build-backend.module-name = "yd"
 
 [[tool.uv.index]]

{yd_cli-0.3 → yd_cli-0.5}/src/yd/cli.py

@@ -9,6 +9,7 @@ from __future__ import annotations
 
 import dataclasses
 import itertools as it
+import logging
 import re
 import sys
 from typing import TYPE_CHECKING, Annotated
@@ -71,15 +72,15 @@ class StrEnumHighlighter[T: enum.StrEnum](
 def _action_styler(action: yd.types.Action) -> str:
     match action:
         case yd.types.Action.CREATE:
-            return "bold #000020 on #0050aa"
+            return "bold #aaccff on #0050aa"
         case yd.types.Action.COPY:
-            return "bold white on #006020"
+            return "bold #aaffbb on #006020"
         case yd.types.Action.DELETE:
-            return "bold #200000 on #aa0000"
+            return "bold #ffaaaa on #aa0000"
         case yd.types.Action.HARDLINK:
-            return "bold white on #606060"
+            return "bold #aaaaaa on #606060"
         case yd.types.Action.ATTRUPDATE:
-            return "bold white on #606060"
+            return "bold #aaaaaa on #606060"
 
 
 def _setup_rich_devices() -> tuple[rich.console.Console, StrEnumHighlighter]:
@@ -89,9 +90,9 @@ def _setup_rich_devices() -> tuple[rich.console.Console, StrEnumHighlighter]:
     theme = rich.theme.Theme(
         highlighter.create_theme_addon(styler=_action_styler)
         | {
-            "progress.elapsed": "bold #ffffaa",
-            "info": "italic #000090",
-            "warning": "bold #900000",
+            "progress.elapsed": "italic #ffffaa",
+            "info": "italic #aaaa00",
+            "warning": "italic #cc0000",
             "error": "bold #ff0000",
         }
     )
@@ -118,7 +119,6 @@ app = typer.Typer(help=_YD_HELP, no_args_is_help=True, rich_markup_mode="markdow
 def _setup_io() -> None:
     global env, console, highlighter  # noqa: PLW0603
 
-    import logging
     from pathlib import Path
 
     console, highlighter = _setup_rich_devices()
@@ -128,16 +128,39 @@ def _setup_io() -> None:
         console.print("Failed to capture environment.", style="error")
         raise typer.Exit(2) from err
 
-    if env.log_level is not None:
+    if env.log_level is None:
+        logging.basicConfig(level=logging.CRITICAL)
+    else:
+        import msgspec
+
         logging.basicConfig(
-            filename=Path.cwd() / ".yd.log",
+            filename=Path.cwd() / ".yd.jsonl",
             encoding="utf-8",
             level=env.log_level,
             force=True,
         )
 
+        _encode_json = msgspec.json.Encoder().encode
+
+        @dataclasses.dataclass(slots=True)
+        class JsonLineFormatter(logging.Formatter):
+            def format(self, record: logging.LogRecord) -> str:
+                return _encode_json(
+                    {
+                        "time": self.formatTime(record),
+                        "level": record.levelname,
+                        "logger": record.name,
+                        "message": record.getMessage(),
+                    }
+                ).decode("utf-8")
+
+        root_logger = logging.getLogger()
+        for handler in root_logger.handlers:
+            handler.setFormatter(JsonLineFormatter())
 
-def _description_column_width(min_width: int = 50) -> int:
+
+# `min_width` chosen to fit min with in 88 character.
+def _description_column_width(min_width: int = 12) -> int:
     import shutil
 
     non_desc_with = (
@@ -152,30 +175,31 @@ def _description_column_width(min_width: int = 50) -> int:
     return max(min_width, shutil.get_terminal_size().columns - non_desc_with)
 
 
-def _create_description(path: str, *, max_len: int, prefix: str = "...") -> str:
+def _clip_path(path: str, *, max_len: int, prefix: str = ".../") -> str:
     from pathlib import Path
 
     if len(label := path) <= max_len:
         return label
 
-    path_ = Path(path)
-    reversed_chosen_parts = tuple(
+    path_, max_len = Path(path), max_len - len(prefix)
+    parts = [
         part
         for part, cum_len in zip(
             reversed(path_.parts),
-            it.accumulate(len(s) for s in reversed(path_.parts)),
+            # Count separating `/` character.
+            it.accumulate(len(s) + 1 for s in reversed(path_.parts)),
             strict=True,
         )
-        if cum_len <= max_len
-    )
-    base = "/".join(reversed(reversed_chosen_parts))
-    if len(base) <= max_len:
-        return base
-    return f"{prefix}{base[-(max_len - len(prefix)) :]}"
+        # Remove overcounted leading `/` character.
+        if cum_len - 1 <= max_len
+    ]
+    return prefix + "/".join(reversed(parts))
 
 
 # Use `list` as return value since type must be available at runtime for typer to work.
-def _complete_config_name(incomplete: str, /) -> list[str]:
+# Argument is passed as kwarg by typer.
+def _complete_config_name(incomplete: str) -> list[str]:
+    env = yd.io.capture_environment()
     return [
         path.stem
         for path in env.config_dir.glob("*.toml")
@@ -379,9 +403,7 @@ def run(
         for binary, args in commands:
             counter = {str(action): 0 for action in yd.types.Action}
             taskid = progress.add_task(
-                description=_create_description(
-                    args[-1], max_len=_description_column_width()
-                ),
+                description=_clip_path(args[-1], max_len=_description_column_width()),
                 **counter,  # type: ignore[ty:invalid-argument-type]
                 total=1,
             )
@@ -400,6 +422,9 @@ def run(
                         ),
                     )
                 )
+            except (KeyboardInterrupt, asyncio.CancelledError) as err:
+                console.print("Terminated by user.", style="warning")
+                raise typer.Exit(2) from err
             except (yd.types.OutputParseError, yd.types.OutputConsumeError) as err:
                 console.print("Failed to handle rsync output.", style="error")
                 raise typer.Exit(2) from err

{yd_cli-0.3 → yd_cli-0.5}/src/yd/io.py

@@ -18,7 +18,7 @@ from yd import types
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from collections.abc import Callable, Iterable
+    from collections.abc import Iterable
     from typing import Literal, overload
 
     @overload
@@ -161,15 +161,18 @@ def list_available_configs(config_dir: Path, /) -> Iterable[types.AvailableConfi
             yield types.AvailableConfig(name=path.stem, description=None)
 
 
-_STDOUT_PATTERNS: tuple[
-    tuple[re.Pattern[str], Callable[[re.Match], types.Transaction | str | None]]
-] = (
+_STDOUT_PATTERNS = (
     (
-        re.compile(r"created\s(1\s)?directory\s(for\s)?(?P<filepath>.+?)"),
+        re.compile(r"created\s1\sdirectory\sfor\s(?P<filepath>.+?)"),
         lambda m: types.Transaction(
             filename=m.group("filepath"), transfer_bytes=0, info="c          "
         ),
     ),
+    (re.compile(r"created\sdirectory\s.+"), lambda _: None),
+    (
+        re.compile(r"cannot\sdelete\snon-empty\sdirectory:\s+(?P<filepath>.*?)"),
+        lambda m: f"Kept non-empty directory {m.group('filepath')}",
+    ),
 )
 _decode_transaction = msgspec.json.Decoder(types.Transaction).decode