Skip invalid contacts CLI rows (#1569)

This commit is contained in:
red person
2026-06-03 08:11:21 +03:00
committed by GitHub
parent 89b04675e2
commit 04e7441d78
2 changed files with 39 additions and 2 deletions

View File

@@ -60,13 +60,17 @@ def fail(msg: str, code: int = 1) -> None:
sys.exit(code)
def _contact_rows(contacts):
return [c for c in contacts or [] if isinstance(c, dict)]
# ─── list ────────────────────────────────────────────────────────────
def cmd_list(args) -> None:
cfg = _get_carddav_config()
if not cfg["url"]:
fail("CardDAV not configured. Set carddav_url/username/password in the web UI.")
contacts = _fetch_contacts(force=args.refresh)
contacts = _contact_rows(_fetch_contacts(force=args.refresh))
emit(contacts, args)
@@ -77,7 +81,7 @@ def cmd_search(args) -> None:
if not cfg["url"]:
fail("CardDAV not configured.")
q = args.query.lower()
contacts = _fetch_contacts()
contacts = _contact_rows(_fetch_contacts())
matches = [
c for c in contacts
if q in (c.get("name") or "").lower() or q in (c.get("email") or "").lower()

View File

@@ -0,0 +1,33 @@
import importlib.machinery
import importlib.util
import sys
import types
from pathlib import Path
from unittest.mock import MagicMock
ROOT = Path(__file__).resolve().parents[1]
def _load_cli(monkeypatch):
routes = types.ModuleType("routes.contacts_routes")
routes._get_carddav_config = MagicMock()
routes._fetch_contacts = MagicMock()
routes._create_contact = MagicMock()
monkeypatch.setitem(sys.modules, "routes.contacts_routes", routes)
path = ROOT / "scripts" / "odysseus-contacts"
loader = importlib.machinery.SourceFileLoader("odysseus_contacts_cli", str(path))
spec = importlib.util.spec_from_loader(loader.name, loader)
module = importlib.util.module_from_spec(spec)
loader.exec_module(module)
return module
def test_contact_rows_skips_invalid_rows(monkeypatch):
cli = _load_cli(monkeypatch)
assert cli._contact_rows([
{"name": "Ada", "email": "ada@example.test"},
"bad-row",
None,
]) == [{"name": "Ada", "email": "ada@example.test"}]