edward/agenda
1
0
Fork 0
Code Issues 27 Pull requests Packages Projects Releases Wiki Activity

Move code around

Browse source
This commit is contained in:
Edward Betts 2023-10-21 15:23:34 +01:00
parent 3aeb2fe467
commit 94c4f47018
1 changed files with 44 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
agenda/__init__.py
View file

@ -323,14 +323,13 @@ def get_birthdays(from_date: date, filepath: str) -> list[Event]:
return events return events
def get_travel(from_date: date, filepath: str) -> list[Event]: def get_accommodation(from_date: date, filepath: str) -> list[Event]:
"""Get birthdays from config.""" """Get birthdays from config."""
events = [] events = []
with open(filepath) as f: with open(filepath) as f:
items = yaml.safe_load(f) items = yaml.safe_load(f)
for item in items: for item in items:
if item["type"] == "accommodation":
title = ( title = (
f'{item["location"]} Airbnb' f'{item["location"]} Airbnb'
if item["operator"] == "airbnb" if item["operator"] == "airbnb"
@ -345,22 +344,33 @@ def get_travel(from_date: date, filepath: str) -> list[Event]:
name="accommodation", name="accommodation",
title=f"check-in {title} ({night_str})", title=f"check-in {title} ({night_str})",
) )
checkout = Event( checkout = Event(date=to_date, name="accommodation", title="check-out " + title)
date=to_date, name="accommodation", title="check-out " + title
)
events += [checkin, checkout] events += [checkin, checkout]
continue
if item["type"] == "transport":
event = Event(
date=datetime.fromisoformat(item["depart"]).date(),
name="transport",
title=f'{item["transport_type"]} from {item["from"]} to {item["to"]}',
)
events.append(event)
return events return events
def get_travel(from_date: date, method: str, filepath: str) -> list[Event]:
"""Get travel events."""
return [
Event(
date=item["depart"].date(),
name="transport",
title=f'{method} from {item["from"]} to {item["to"]}',
)
for item in yaml.safe_load(open(filepath))
if item["depart"].date() >= from_date
]
def get_all_travel_events(from_date: date) -> list[Event]:
"""Get all flights and rail journeys."""
data_dir = config["data"]["personal-data"]
trains = get_travel(from_date, "train", os.path.join(data_dir, "trains.yaml"))
flights = get_travel(from_date, "flight", os.path.join(data_dir, "flights.yaml"))
return trains + flights
def waste_collection_events() -> list[Event]: def waste_collection_events() -> list[Event]:
"""Waste colllection events.""" """Waste colllection events."""
postcode = "BS48 3HG" postcode = "BS48 3HG"
@ -410,9 +420,11 @@ def get_data(now: datetime) -> dict[str, str | object]:
for key, value in xmas_last_posting_dates.items(): for key, value in xmas_last_posting_dates.items():
events.append(Event(name=f"xmas_last_{key}", date=value)) events.append(Event(name=f"xmas_last_{key}", date=value))
events += get_birthdays(today, config["data"]["entities"]) my_data = config["data"]["personal-data"]
events += get_travel(today, config["data"]["travel"]) events += get_birthdays(today, os.path.join(my_data, "entities.yaml"))
events += get_conferences(today, config["data"]["conferences"]) events += get_accommodation(today, os.path.join(my_data, "accommodation.yaml"))
events += get_all_travel_events(today)
events += get_conferences(today, os.path.join(my_data, "conferences.yaml"))
events += waste_collection_events() events += waste_collection_events()
next_up_series = Event( next_up_series = Event(