From cd0ffb33909aea2f865d0ae21761e465cba4a2a1 Mon Sep 17 00:00:00 2001 From: Edward Betts Date: Mon, 8 Jan 2024 15:20:48 +0000 Subject: [PATCH] Hide LHG run club when on a trip Closes: #95 --- agenda/data.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/agenda/data.py b/agenda/data.py index 56ade71..a75a848 100644 --- a/agenda/data.py +++ b/agenda/data.py @@ -261,7 +261,7 @@ def read_events_yaml(data_dir: str, start: date, end: date) -> list[Event]: return events -def find_markets_during_stay( +def find_events_during_stay( accommodation_events: list[Event], markets: list[Event] ) -> list[Event]: """Market events that happen during accommodation stays.""" @@ -451,11 +451,15 @@ async def get_data( events += domains.renewal_dates(my_data) # hide markets that happen while away - markets = [e for e in events if e.name == "market"] + optional = [ + e + for e in events + if e.name == "market" or (e.title and "LHG Run Club" in e.title) + ] going = [e for e in events if e.going] - overlapping_markets = find_markets_during_stay( - accommodation_events + going, markets + overlapping_markets = find_events_during_stay( + accommodation_events + going, optional ) for market in overlapping_markets: events.remove(market)