Notizen
diff --git a/src/db.py b/src/db.py
index bda05dc..7e9136b 100644
--- a/src/db.py
+++ b/src/db.py
@@ -279,3 +279,81 @@ def replace_all_contacts_for_account(conn, account: str, contacts: list[dict], r
raise
conn.commit()
logger.info("Voller Re-Sync für Account %s abgeschlossen: %d Kontakte", account, len(contacts))
+
+
+def upsert_groups(conn, groups: list[dict], run_id: str):
+ if not groups:
+ return
+ now = datetime.now(timezone.utc)
+ with conn.cursor() as cur:
+ for g in groups:
+ g["sync_run_id"] = run_id
+ g["last_synced_at"] = now
+ member_uids = g.pop("member_uids", [])
+ cols = [k for k in g if k != "member_uids"]
+ placeholders = ", ".join(["%s"] * len(cols))
+ update_clause = ", ".join(f"{col}=VALUES({col})" for col in cols if col not in ("account", "uid"))
+ sql = (
+ f"INSERT INTO `groups` ({', '.join(cols)}) VALUES ({placeholders}) "
+ f"ON DUPLICATE KEY UPDATE {update_clause}"
+ )
+ try:
+ cur.execute(sql, [g[c] for c in cols])
+ except Exception as exc:
+ logger.error("INSERT Gruppe fehlgeschlagen für UID %s: %s", g.get("uid"), exc)
+ raise
+ cur.execute("SELECT id FROM `groups` WHERE account = %s AND uid = %s", (g["account"], g["uid"]))
+ row = cur.fetchone()
+ if not row:
+ logger.error("Konnte Gruppen-ID nicht ermitteln für UID %s", g.get("uid"))
+ continue
+ group_id = row["id"]
+ cur.execute("DELETE FROM group_members WHERE group_id = %s", (group_id,))
+ if member_uids:
+ member_values = [(group_id, uid) for uid in member_uids]
+ cur.executemany(
+ "INSERT INTO group_members (group_id, member_uid) VALUES (%s, %s)",
+ member_values,
+ )
+ conn.commit()
+
+
+def delete_groups_by_uids(conn, account: str, uids: list[str]):
+ if not uids:
+ return
+ with conn.cursor() as cur:
+ placeholders = ", ".join(["%s"] * len(uids))
+ cur.execute(
+ f"DELETE FROM `groups` WHERE account = %s AND uid IN ({placeholders})",
+ [account] + uids,
+ )
+ conn.commit()
+
+
+def replace_all_groups_for_account(conn, account: str, groups: list[dict], run_id: str):
+ with conn.cursor() as cur:
+ cur.execute("DELETE FROM `groups` WHERE account = %s", (account,))
+ conn.commit()
+ if groups:
+ upsert_groups(conn, groups, run_id)
+ logger.info("Gruppen-Re-Sync für Account %s abgeschlossen: %d Gruppen", account, len(groups))
+
+
+def get_groups_for_contact(conn, account: str, member_uid: str) -> list[dict]:
+ with conn.cursor() as cur:
+ cur.execute(
+ """SELECT g.id, g.name, g.uid
+ FROM `groups` g
+ JOIN group_members gm ON gm.group_id = g.id
+ WHERE g.account = %s AND gm.member_uid = %s
+ ORDER BY g.name""",
+ (account, member_uid),
+ )
+ return cur.fetchall()
+
+
+def get_group_count(conn, account: str | None) -> int:
+ where_clause, params = _account_filter_clause(account)
+ with conn.cursor() as cur:
+ cur.execute(f"SELECT COUNT(*) AS total FROM `groups` {where_clause}", params)
+ return cur.fetchone()["total"]
diff --git a/src/sync.py b/src/sync.py
index 2bc7675..00e7cdd 100644
--- a/src/sync.py
+++ b/src/sync.py
@@ -12,12 +12,30 @@ import sys
import db
from carddav_client import ICLOUD_BASE_URL, CardDAVClient, SyncTokenInvalid
from config import Config
-from vcard_parser import parse_vcard
+from vcard_parser import is_group_vcard, parse_group, parse_vcard
logging.basicConfig(level=Config.LOG_LEVEL, format="%(asctime)s [%(levelname)s] %(message)s")
logger = logging.getLogger("sync")
+def _classify_vcards(raw_vcards, raw_etags, account_name):
+ contacts, groups = [], []
+ for v, etag in zip(raw_vcards, raw_etags):
+ if is_group_vcard(v):
+ g = parse_group(v, account_name, etag=etag)
+ if g:
+ groups.append(g)
+ else:
+ logger.warning("[%s] Gruppen-vCard konnte nicht geparst werden, überspringe", account_name)
+ else:
+ c = parse_vcard(v, account_name, etag=etag)
+ if c:
+ contacts.append(c)
+ else:
+ logger.warning("[%s] vCard konnte nicht geparst werden, überspringe", account_name)
+ return contacts, groups
+
+
def sync_account(conn, account, href_to_uid_cache: dict):
client = CardDAVClient(ICLOUD_BASE_URL, account.apple_email, account.apple_app_password)
collection_url = client.discover_collection()
@@ -30,19 +48,14 @@ def sync_account(conn, account, href_to_uid_cache: dict):
if not stored_token:
logger.info("[%s] Kein sync-token vorhanden, führe initialen Full-Sync aus", account.name)
raw_vcards, raw_etags = client.fetch_all_vcards(collection_url)
- contacts = []
- for v, etag in zip(raw_vcards, raw_etags):
- c = parse_vcard(v, account.name, etag=etag)
- if c:
- contacts.append(c)
- else:
- logger.warning("[%s] vCard konnte nicht geparst werden, überspringe", account.name)
+ contacts, groups = _classify_vcards(raw_vcards, raw_etags, account.name)
db.replace_all_contacts_for_account(conn, account.name, contacts, run_id)
+ db.replace_all_groups_for_account(conn, account.name, groups, run_id)
_, _, _, new_token = client.sync_collection(collection_url, None, fetch_missing=False)
if new_token:
db.save_sync_token(conn, account.name, new_token)
db.finish_sync_run(conn, run_id, "success", upserted=len(contacts), deleted=0)
- logger.info("[%s] Initialer Sync abgeschlossen: %d Kontakte", account.name, len(contacts))
+ logger.info("[%s] Initialer Sync abgeschlossen: %d Kontakte, %d Gruppen", account.name, len(contacts), len(groups))
return
try:
@@ -51,29 +64,19 @@ def sync_account(conn, account, href_to_uid_cache: dict):
logger.warning("[%s] sync-token vom Server abgelehnt, führe vollen Re-Sync aus", account.name)
db.clear_sync_token(conn, account.name)
raw_vcards, raw_etags = client.fetch_all_vcards(collection_url)
- contacts = []
- for v, etag in zip(raw_vcards, raw_etags):
- c = parse_vcard(v, account.name, etag=etag)
- if c:
- contacts.append(c)
- else:
- logger.warning("[%s] vCard konnte nicht geparst werden, überspringe", account.name)
+ contacts, groups = _classify_vcards(raw_vcards, raw_etags, account.name)
db.replace_all_contacts_for_account(conn, account.name, contacts, run_id)
+ db.replace_all_groups_for_account(conn, account.name, groups, run_id)
_, _, _, new_token = client.sync_collection(collection_url, None, fetch_missing=False)
if new_token:
db.save_sync_token(conn, account.name, new_token)
db.finish_sync_run(conn, run_id, "success", upserted=len(contacts), deleted=0)
- logger.info("[%s] Re-Sync abgeschlossen: %d Kontakte", account.name, len(contacts))
+ logger.info("[%s] Re-Sync abgeschlossen: %d Kontakte, %d Gruppen", account.name, len(contacts), len(groups))
return
- contacts = []
- for v, etag in zip(changed_vcards, etags):
- c = parse_vcard(v, account.name, etag=etag)
- if c:
- contacts.append(c)
- else:
- logger.warning("[%s] vCard konnte nicht geparst werden, überspringe", account.name)
+ contacts, groups = _classify_vcards(changed_vcards, etags, account.name)
db.upsert_contacts(conn, contacts, run_id)
+ db.upsert_groups(conn, groups, run_id)
deleted_uids = []
for href in deleted_hrefs:
@@ -83,14 +86,15 @@ def sync_account(conn, account, href_to_uid_cache: dict):
else:
logger.warning("[%s] Konnte UID nicht aus href extrahieren: %s", account.name, href)
db.delete_contacts_by_href_uids(conn, account.name, deleted_uids)
+ db.delete_groups_by_uids(conn, account.name, deleted_uids)
if new_token:
db.save_sync_token(conn, account.name, new_token)
db.finish_sync_run(conn, run_id, "success", upserted=len(contacts), deleted=len(deleted_uids))
logger.info(
- "[%s] Delta-Sync abgeschlossen: %d geändert/neu, %d gelöscht",
- account.name, len(contacts), len(deleted_uids),
+ "[%s] Delta-Sync abgeschlossen: %d geändert/neu, %d gelöscht (%d Gruppen geändert)",
+ account.name, len(contacts), len(deleted_uids), len(groups),
)
except Exception as exc:
logger.exception("[%s] Sync-Lauf %s fehlgeschlagen", account.name, run_id)
diff --git a/src/vcard_parser.py b/src/vcard_parser.py
index 7ede460..03fe680 100644
--- a/src/vcard_parser.py
+++ b/src/vcard_parser.py
@@ -33,6 +33,48 @@ def _type_str(obj) -> str:
return "other"
+_GROUP_MARKER = "X-ADDRESSBOOKSERVER-KIND:group"
+_MEMBER_PREFIX = "urn:uuid:"
+
+
+def is_group_vcard(raw_text: str) -> bool:
+ return _GROUP_MARKER in raw_text
+
+
+def parse_group(raw_text: str, account: str, etag: str | None = None) -> dict | None:
+ try:
+ vcard = vobject.readOne(raw_text)
+ except Exception as exc:
+ logger.warning("Gruppen-vCard konnte nicht geparst werden: %s", exc)
+ return None
+
+ uid = _get(vcard, "uid")
+ if not uid:
+ logger.warning("Gruppen-vCard ohne UID übersprungen")
+ return None
+
+ member_uids = []
+ for member in vcard.contents.get("x-addressbookserver-member", []):
+ value = member.value if hasattr(member, "value") else str(member)
+ if value.startswith(_MEMBER_PREFIX):
+ member_uids.append(value[len(_MEMBER_PREFIX):])
+ else:
+ member_uids.append(value)
+
+ if not member_uids:
+ logger.debug("Gruppe %s hat keine Members, überspringe", uid)
+ return None
+
+ return {
+ "account": account,
+ "uid": uid,
+ "etag": etag,
+ "name": _scalar(_get(vcard, "fn")),
+ "raw_vcard": raw_text,
+ "member_uids": member_uids,
+ }
+
+
def parse_vcard(raw_text: str, account: str, etag: str | None = None) -> dict | None:
try:
vcard = vobject.readOne(raw_text)