From ee51e8578680f5bb02157d684ccb19e60cdd4cc0 Mon Sep 17 00:00:00 2001 From: Kaaninchen <124433727+kaaninchen@users.noreply.github.com> Date: Tue, 18 Aug 2026 00:21:58 +0200 Subject: [PATCH] transitous rewrite: set vc status to next_station --- config.json.example | 6 ++++-- src/api/transitous.py | 4 ++-- src/data/locales/de.yaml | 1 - src/data/locales/en.yaml | 1 - src/data/operators.py | 6 ++++++ src/lang/language_models.py | 1 - src/utils.py | 1 - 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/config.json.example b/config.json.example index c5f9041..171972a 100644 --- a/config.json.example +++ b/config.json.example @@ -3,13 +3,15 @@ "token": "", "server": , "vc": , - "lang": "de" + "lang": "de", "formatting": "┇", "emojis": true }, "connections": { "stations": [ - "" + "Berlin Hauptbahnhof", + "Amsterdam", + "Helsinki" ], "blacklist": [], "min_duration": 5, diff --git a/src/api/transitous.py b/src/api/transitous.py index 06cc738..c69c5b3 100644 --- a/src/api/transitous.py +++ b/src/api/transitous.py @@ -123,7 +123,7 @@ def get_random_stop_id() -> str | None: stop_ids_list = list(stop_ids.keys()) if len(stop_ids_list) > 1: - logger(f"No station associated as '{assigned_station}', choosing random from similar named station") + logger(f"No station associated as '{assigned_station}', choosing random from similar named stations") logger(f"Run `python run main.py stations` to get exact station names") chosen_stop_id, chosen_station = random.choice(list(stop_ids.items())) logger(f"Assigned Station: {chosen_station}") @@ -235,8 +235,8 @@ def get_trip_details(random_connection: dict | None) -> dict | None: "to": goes_to, "agency": legs["agencyName"], "route_color": legs.get("routeColor"), - "duration": legs["duration"], "departure": departure_dt.strftime("%H:%M"), + "departure_dt": departure_dt, "arrival": arrival_dt.strftime("%H:%M"), "arrival_dt": arrival_dt, "mode": mode, diff --git a/src/data/locales/de.yaml b/src/data/locales/de.yaml index 4fe234c..a19afeb 100644 --- a/src/data/locales/de.yaml +++ b/src/data/locales/de.yaml @@ -1,5 +1,4 @@ channel: - status: "Ankunft um {arrival}" long_name: train_from: "{train_name} nach {goes_to} von {train_from}" train_via: "{train_name} nach {goes_to} über {from_station}" diff --git a/src/data/locales/en.yaml b/src/data/locales/en.yaml index 4373207..2e8adcb 100644 --- a/src/data/locales/en.yaml +++ b/src/data/locales/en.yaml @@ -1,5 +1,4 @@ channel: - status: "Ankunft um {arrival}" long_name: train_from: "{train_name} to {goes_to} from {train_from}" train_via: "{train_name} to {goes_to} via {from_station}" diff --git a/src/data/operators.py b/src/data/operators.py index dec5cfe..5818f2b 100644 --- a/src/data/operators.py +++ b/src/data/operators.py @@ -110,9 +110,15 @@ OPERATORS = { "GVB": { "logo": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/BSicon_LOGO_GVB.svg/960px-BSicon_LOGO_GVB.svg.png", "color": 0x2B62AF + }, + "Berliner Verkehrsbetriebe": { + "logo": "https://upload.wikimedia.org/wikipedia/commons/thumb/b/bf/BVG_Logo_07.2021.svg/960px-BVG_Logo_07.2021.svg.png", + "color": 0xEFD13C } } + + OPERATOR_ALIASES = { "Arverio Bayern GmbH": OPERATORS["Arverio Bayern"], "DB Regio AG Baden-Württemberg": OPERATORS["db_bawü"], diff --git a/src/lang/language_models.py b/src/lang/language_models.py index e99a54b..08cd1a7 100644 --- a/src/lang/language_models.py +++ b/src/lang/language_models.py @@ -15,7 +15,6 @@ class LongName: @dataclass class Channel: - status: str long_name: LongName diff --git a/src/utils.py b/src/utils.py index ef58390..f353d21 100644 --- a/src/utils.py +++ b/src/utils.py @@ -157,7 +157,6 @@ def get_next_station(stops: dict, train_from: str) -> dict | None: "name": name, "arrival": arrival_dt } - return None def format_via_list(stops: dict, via_and: str) -> str: