From 5d5b9016d1759e192eb0be0653776e34fe90c9f4 Mon Sep 17 00:00:00 2001 From: Edward Betts Date: Sat, 25 Nov 2023 10:08:49 +0000 Subject: [PATCH 1/2] Include launches with unknown time as day events in calendar --- agenda/data.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/agenda/data.py b/agenda/data.py index 32c56f7..849b205 100644 --- a/agenda/data.py +++ b/agenda/data.py @@ -265,14 +265,20 @@ async def get_data(now: datetime) -> typing.Mapping[str, str | object]: events += domains.renewal_dates(my_data) for launch in rockets: - if not launch["t0_time"]: + dt = None + + if launch["net_precision"] == "Day": + dt = datetime.strptime(launch["net"], "%Y-%m-%dT00:00:00Z").date() + elif launch["t0_time"]: + dt = pytz.utc.localize( + datetime.strptime(launch["net"], "%Y-%m-%dT%H:%M:%SZ") + ) + + if not dt: continue - dt = pytz.utc.localize(datetime.strptime(launch["net"], "%Y-%m-%dT%H:%M:%SZ")) - e = Event( - name="rocket", - date=dt, - title=f'🚀{launch["rocket"]}: {launch["mission"]["name"]}', - ) + + rocket_name = f'🚀{launch["rocket"]}: {launch["mission"]["name"]}' + e = Event(name="rocket", date=dt, title=rocket_name) events.append(e) events.sort(key=operator.attrgetter("as_datetime")) From 9185052092558f9a25a287775e49192156b61ffd Mon Sep 17 00:00:00 2001 From: Edward Betts Date: Sat, 25 Nov 2023 10:09:13 +0000 Subject: [PATCH 2/2] Sometimes there is no launch pad wikipedia URL --- templates/index.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/index.html b/templates/index.html index 7e700df..6911ab2 100644 --- a/templates/index.html +++ b/templates/index.html @@ -193,7 +193,11 @@ — {{ launch.orbit.name }} ({{ launch.orbit.abbrev }})
- {{ launch.pad_name }} + {% if launch.pad_wikipedia_url %} + {{ launch.pad_name }} + {% else %} + {{ launch.pad_name }} {% if launch.pad_name != "Unknown Pad" %}(no Wikipedia article){% endif %} + {% endif %} — {{ launch.location }}
{% for line in launch.mission.description.splitlines() %}