From 826eafbc8613ac10dc4d513bd2fabc642a46b36a Mon Sep 17 00:00:00 2001 From: Edward Betts Date: Wed, 27 Mar 2024 16:34:24 +0000 Subject: [PATCH 1/3] Add UnknownStation Exception --- agenda/trip.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/agenda/trip.py b/agenda/trip.py index 06fbf2a..db148e9 100644 --- a/agenda/trip.py +++ b/agenda/trip.py @@ -9,6 +9,12 @@ from agenda import travel from agenda.types import StrDict, Trip +class UnknownStation(Exception): + """Unknown station.""" + + pass + + def load_travel(travel_type: str, data_dir: str) -> list[StrDict]: """Read flight and train journeys.""" items = travel.parse_yaml(travel_type + "s", data_dir) @@ -24,8 +30,10 @@ def load_trains(data_dir: str) -> list[StrDict]: by_name = {station["name"]: station for station in stations} for train in trains: - assert train["from"] in by_name - assert train["to"] in by_name + if train["from"] not in by_name: + raise UnknownStation(train["from"]) + if train["to"] not in by_name: + raise UnknownStation(train["to"]) train["from_station"] = by_name[train["from"]] train["to_station"] = by_name[train["to"]] From cff981eb8ba74d24bae12e18f0c48860935cb3a5 Mon Sep 17 00:00:00 2001 From: Edward Betts Date: Wed, 27 Mar 2024 16:35:13 +0000 Subject: [PATCH 2/3] Adjust default event duration to be 30 minutes --- agenda/calendar.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agenda/calendar.py b/agenda/calendar.py index 56ef6c8..039c546 100644 --- a/agenda/calendar.py +++ b/agenda/calendar.py @@ -61,7 +61,7 @@ def build_events(events: list[Event]) -> list[dict[str, typing.Any]]: continue if e.has_time: - end = e.end_date or e.date + timedelta(hours=1) + end = e.end_date or e.date + timedelta(minutes=30) else: end = (e.end_as_date if e.end_date else e.as_date) + one_day item = { From 6018f0217d22ad39d73650db6c4743b6a2344a3f Mon Sep 17 00:00:00 2001 From: Edward Betts Date: Wed, 27 Mar 2024 16:37:20 +0000 Subject: [PATCH 3/3] Make use of CDN optional --- templates/base.html | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/templates/base.html b/templates/base.html index 7b1cbde..08ccfb7 100644 --- a/templates/base.html +++ b/templates/base.html @@ -7,7 +7,11 @@ {% block title %}{% endblock %} - + {% if config.USE_CDN %} + + {% else %} + + {% endif %} {% block style %} {% endblock %} @@ -18,6 +22,10 @@ {% block nav %}{{ navbar() }}{% endblock %} {% block content %}{% endblock %} {% block scripts %}{% endblock %} - + {% if config.USE_CDN %} + + {% else %} + + {% endif %}