From 82a073ecb9e7b803a4380422b283fa89b3454718 Mon Sep 17 00:00:00 2001 From: Florian Date: Fri, 20 Nov 2026 21:12:26 +0100 Subject: [PATCH] Changed return type to a Message from the shared models library --- src/event_helper.py | 23 -------------------- src/notification_helper.py | 43 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 23 deletions(-) delete mode 100644 src/event_helper.py create mode 100644 src/notification_helper.py diff --git a/src/event_helper.py b/src/event_helper.py deleted file mode 100644 index 7d808cf..0000000 --- a/src/event_helper.py +++ /dev/null @@ -1,23 +0,0 @@ -from typing import assert_never - -from models import SourceType - -def _bvb(event: str) -> list[str]: - entries = event.split("|") - event = entries[0] - if entries[1].strip().lower() == "ucl": - competition = f"{entries[1].strip()} - {entries[2].strip()}" - match_day = entries[3].strip() - else: - competition = entries[1].strip() - match_day = entries[2].strip() - return [entries, competition, match_day] - -def event_formatting(event: str, source: SourceType) -> list[str]: - match source: - case SourceType.BVB: - return _bvb(event) - case SourceType.GENERIC: - return [event] - case _: - assert_never(source) \ No newline at end of file diff --git a/src/notification_helper.py b/src/notification_helper.py new file mode 100644 index 0000000..07d8171 --- /dev/null +++ b/src/notification_helper.py @@ -0,0 +1,43 @@ +from typing import assert_never + +from models import SourceType, CalendarEntry +from shared_models import Message, Category +from simple_logger_handler import setup_logger + +logger = setup_logger(__name__) + +def _bvb(entry: CalendarEntry) -> Message: + parts = [p.strip() for p in entry.summary.split("|")] + + try: + match_name, competition, *rest = parts + if competition.lower() == "ucl": + stage, match_day = rest[0], rest[1] + competition = f"{competition} - {stage}" + else: + match_day = rest[0] + except (ValueError, IndexError): + logger.warning("[BVB] Unexpected summary format, using generic: %s", entry.summary) + return _generic(entry) + + return Message( + title=match_name, + body=f"{competition} · {match_day} · {entry.date:%a %d %b, %H:%M}", + category=Category.WATCHING, + ) + +def _generic(entry: CalendarEntry) -> Message: + return Message( + title=entry.summary, + body=f"{entry.date:%a %d %b, %H:%M}", + category=Category.WATCHING + ) + +def format_event(entry: CalendarEntry, source: SourceType) -> Message: + match source: + case SourceType.BVB: + return _bvb(entry) + case SourceType.GENERIC: + return _generic(entry) + case _: + assert_never(source) \ No newline at end of file