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

Add command line utility to validate YAML

Browse source
This commit is contained in:
Edward Betts 2024-03-11 15:58:56 +00:00
parent f1338e5970
commit 4ebb08f68e
2 changed files with 35 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
agenda/trip.py
View file

@ -9,20 +9,17 @@ from agenda import travel
from agenda.types import StrDict, Trip
def load_travel(travel_type: str) -> list[StrDict]:
def load_travel(travel_type: str, data_dir: str) -> list[StrDict]:
"""Read flight and train journeys."""
data_dir = flask.current_app.config["PERSONAL_DATA"]
items = travel.parse_yaml(travel_type + "s", data_dir)
for item in items:
item["type"] = travel_type
return items
def load_trains() -> list[StrDict]:
def load_trains(data_dir: str) -> list[StrDict]:
"""Load trains."""
data_dir = flask.current_app.config["PERSONAL_DATA"]
trains = load_travel("train")
trains = load_travel("train", data_dir)
stations = travel.parse_yaml("stations", data_dir)
by_name = {station["name"]: station for station in stations}
@ -48,10 +45,9 @@ def depart_datetime(item: StrDict) -> datetime:
return datetime.combine(depart, time.min).replace(tzinfo=ZoneInfo("UTC"))
def load_flights() -> list[StrDict]:
def load_flights(data_dir: str) -> list[StrDict]:
"""Load flights."""
data_dir = flask.current_app.config["PERSONAL_DATA"]
flights = load_travel("flight")
flights = load_travel("flight", data_dir)
airlines = yaml.safe_load(open(os.path.join(data_dir, "airlines.yaml")))
airports = travel.parse_yaml("airports", data_dir)
for flight in flights:
@ -64,13 +60,16 @@ def load_flights() -> list[StrDict]:
return flights
def build_trip_list() -> list[Trip]:
def build_trip_list(data_dir: str | None = None) -> list[Trip]:
"""Generate list of trips."""
trips: dict[date, Trip] = {}
data_dir = flask.current_app.config["PERSONAL_DATA"]
if data_dir is None:
data_dir = flask.current_app.config["PERSONAL_DATA"]
travel_items = sorted(load_flights() + load_trains(), key=depart_datetime)
travel_items = sorted(
load_flights(data_dir) + load_trains(data_dir), key=depart_datetime
)
data = {
"travel": travel_items,