diff --git a/app.py b/app.py index 2d2a2e2..cdfa4ef 100644 --- a/app.py +++ b/app.py @@ -16,12 +16,6 @@ RTT_PADDINGTON_URL = ( "?stp=WVS&show=pax-calls&order=wtt" ) -RTT_BRISTOL_URL = ( - "https://www.realtimetrains.co.uk/search/detailed/" - "gb-nr:BRI/to/gb-nr:PAD/{date}/0000-2359" - "?stp=WVS&show=pax-calls&order=wtt" -) - app = Flask(__name__) DESTINATIONS = { @@ -36,16 +30,10 @@ DESTINATIONS = { @app.route('/') def index(): today = date.today().isoformat() - return render_template( - 'index.html', - destinations=DESTINATIONS, - today=today, - valid_min_connections=sorted(VALID_MIN_CONNECTIONS), - valid_max_connections=sorted(VALID_MAX_CONNECTIONS), - ) + return render_template('index.html', destinations=DESTINATIONS, today=today) -VALID_MIN_CONNECTIONS = {45, 50, 60, 70, 80, 90, 100, 110, 120} +VALID_MIN_CONNECTIONS = {50, 60, 70, 80, 90, 100, 110, 120} VALID_MAX_CONNECTIONS = {60, 70, 80, 90, 100, 110, 120, 130, 140, 150, 160, 170, 180} @@ -166,9 +154,8 @@ def results(slug, travel_date): next_date = (dt + timedelta(days=1)).isoformat() travel_date_display = dt.strftime('%A %-d %B %Y') - eurostar_url = eurostar_scraper.search_url(destination, travel_date) + eurostar_url = eurostar_scraper.timetable_url(destination) + f"?date={travel_date}" rtt_url = RTT_PADDINGTON_URL.format(date=travel_date) - rtt_bristol_url = RTT_BRISTOL_URL.format(date=travel_date) return render_template( 'results.html', @@ -188,7 +175,6 @@ def results(slug, travel_date): error=error, eurostar_url=eurostar_url, rtt_url=rtt_url, - rtt_bristol_url=rtt_bristol_url, min_connection=min_connection, max_connection=max_connection, valid_min_connections=sorted(VALID_MIN_CONNECTIONS), diff --git a/scraper/eurostar.py b/scraper/eurostar.py index 4bbdfd9..8ae5129 100644 --- a/scraper/eurostar.py +++ b/scraper/eurostar.py @@ -48,14 +48,6 @@ def _slugify_station_name(name: str) -> str: return re.sub(r'[^a-z0-9]+', '-', name.lower()).strip('-') -def search_url(destination: str, travel_date: str) -> str: - dest_id = DESTINATION_STATION_IDS[destination] - return ( - f'https://www.eurostar.com/search/uk-en' - f'?adult=1&origin={ORIGIN_STATION_ID}&destination={dest_id}&outbound={travel_date}' - ) - - def timetable_url(destination: str) -> str: dest_id = DESTINATION_STATION_IDS[destination] dest_slug = _slugify_station_name(destination) diff --git a/templates/index.html b/templates/index.html index 306fb90..c8300a4 100644 --- a/templates/index.html +++ b/templates/index.html @@ -47,7 +47,7 @@ Minimum connection time (Paddington → St Pancras) @@ -58,7 +58,7 @@ Maximum connection time (Paddington → St Pancras) diff --git a/templates/results.html b/templates/results.html index 12a2f97..c1a0a1a 100644 --- a/templates/results.html +++ b/templates/results.html @@ -83,7 +83,7 @@ {% if unreachable_morning_services %}  ·  - {{ unreachable_morning_services | length }} Eurostar service{{ 's' if unreachable_morning_services | length != 1 }} unavailable from Bristol + {{ unreachable_morning_services | length }} morning service{{ 's' if unreachable_morning_services | length != 1 }} unavailable from Bristol {% endif %} {% if from_cache %} @@ -116,11 +116,6 @@ {% if trips %} {% set best_mins = trips | map(attribute='total_minutes') | min %} {% set worst_mins = trips | map(attribute='total_minutes') | max %} - {% set priced_trips = trips | selectattr('total_price') | list %} - {% if priced_trips | length > 1 %} - {% set min_price = priced_trips | map(attribute='total_price') | min %} - {% set max_price = priced_trips | map(attribute='total_price') | max %} - {% endif %} {% endif %} {% for row in result_rows %} {% if row.row_type == 'trip' and row.total_minutes <= best_mins + 5 and trips | length > 1 %} @@ -142,14 +137,14 @@ {{ row.arrive_paddington }} - ({{ row.gwr_duration }}) + ({{ row.gwr_duration }}) £{{ "%.2f"|format(row.ticket_price) }}
{{ row.ticket_name }} - {{ row.connection_duration }}{% if row.connection_minutes < 80 %} ⚠️{% endif %} + {{ row.connection_duration }} {{ row.depart_st_pancras }} @@ -168,14 +163,14 @@ {% if row.total_minutes <= best_mins + 5 and trips | length > 1 %} - {{ row.total_duration }} ⚡ + {{ row.total_duration }} ⚡ {% elif row.total_minutes >= worst_mins - 5 and trips | length > 1 %} - {{ row.total_duration }} 🐢 + {{ row.total_duration }} 🐢 {% else %} {{ row.total_duration }} {% endif %} {% if row.total_price is not none %} -
£{{ "%.2f"|format(row.total_price) }}{% if min_price is defined and max_price is defined %}{% if row.total_price <= min_price + 10 %} 💰{% elif row.total_price >= max_price - 10 %} 💸{% endif %}{% endif %} +
£{{ "%.2f"|format(row.total_price) }} {% endif %} {% else %} @@ -210,12 +205,13 @@

Paddington → St Pancras connection: {{ min_connection }}–{{ max_connection }} min. + {% if unreachable_morning_services %} + Morning means Eurostar departures before 12:00 from St Pancras. + {% endif %} GWR walk-on single prices for Bristol Temple Meads → Paddington. Eurostar Standard prices are for 1 adult in GBP; always check eurostar.com to book.  ·  - Bristol departures on RTT -  ·  Paddington arrivals on RTT

diff --git a/tests/test_app.py b/tests/test_app.py index d4de5c2..cd21232 100644 --- a/tests/test_app.py +++ b/tests/test_app.py @@ -155,8 +155,8 @@ def test_results_marks_trips_within_five_minutes_of_fastest_and_slowest(monkeypa html = resp.get_data(as_text=True) assert resp.status_code == 200 - assert html.count('title="Fastest journey"') == 2 - assert html.count('title="Slowest journey"') == 2 + assert html.count('title="Fastest option"') == 2 + assert html.count('title="Slowest option"') == 2 assert '4h 50m ⚡' in html assert '4h 55m ⚡' in html assert '5h 20m 🐢' in html @@ -211,10 +211,11 @@ def test_results_shows_unreachable_morning_eurostar_services(monkeypatch): html = resp.get_data(as_text=True) assert resp.status_code == 200 - assert '2 Eurostar services unavailable from Bristol' in html + assert '1 morning service unavailable from Bristol' in html assert '09:30' in html assert 'ES 9001' in html assert 'Unavailable from Bristol' in html + assert 'Morning means Eurostar departures before 12:00 from St Pancras.' in html assert html.index('09:30') < html.index('10:15') @@ -266,6 +267,6 @@ def test_results_can_show_only_unreachable_morning_services(monkeypatch): assert resp.status_code == 200 assert 'No valid journeys found.' not in html - assert '1 Eurostar service unavailable from Bristol' in html + assert '1 morning service unavailable from Bristol' in html assert '09:30' in html assert 'Unavailable from Bristol' in html diff --git a/tests/test_trip_planner.py b/tests/test_trip_planner.py index a04d8d8..5e1c93c 100644 --- a/tests/test_trip_planner.py +++ b/tests/test_trip_planner.py @@ -131,9 +131,7 @@ def test_connection_duration_in_trip(): assert trips[0]['connection_duration'] == '1h 16m' -def test_find_unreachable_eurostars_excludes_connectable_services(): - # GWR arrives 08:45; default min=50/max=110 → viable window 09:35–10:35. - # 09:30 too early, 10:15 connectable, 12:30 beyond max connection. +def test_unreachable_morning_eurostars_lists_only_unreachable_morning_services(): gwr = [ {'depart_bristol': '07:00', 'arrive_paddington': '08:45'}, ] @@ -145,7 +143,7 @@ def test_find_unreachable_eurostars_excludes_connectable_services(): unreachable = find_unreachable_morning_eurostars(gwr, eurostar, DATE) - assert [s['depart_st_pancras'] for s in unreachable] == ['09:30', '12:30'] + assert [service['depart_st_pancras'] for service in unreachable] == ['09:30'] # --------------------------------------------------------------------------- @@ -207,7 +205,7 @@ def test_combine_trips_includes_ticket_fields(): assert 'ticket_code' in t -def test_find_unreachable_eurostars_returns_empty_when_all_connectable(): +def test_unreachable_morning_eurostars_returns_empty_when_morning_service_is_reachable(): gwr = [ {'depart_bristol': '07:00', 'arrive_paddington': '08:45'}, ] diff --git a/trip_planner.py b/trip_planner.py index c7e3286..ca178d6 100644 --- a/trip_planner.py +++ b/trip_planner.py @@ -6,6 +6,7 @@ from datetime import datetime, timedelta, time as _time MIN_CONNECTION_MINUTES = 50 MAX_CONNECTION_MINUTES = 110 MAX_GWR_MINUTES = 110 +MORNING_CUTOFF_HOUR = 12 DATE_FMT = '%Y-%m-%d' TIME_FMT = '%H:%M' @@ -127,7 +128,6 @@ def combine_trips( 'arrive_paddington': gwr['arrive_paddington'], 'headcode': gwr.get('headcode', ''), 'gwr_duration': _fmt_duration(int((arr_pad - dep_bri).total_seconds() / 60)), - 'connection_minutes': int((dep_stp - arr_pad).total_seconds() / 60), 'connection_duration': _fmt_duration(int((dep_stp - arr_pad).total_seconds() / 60)), 'depart_st_pancras': es['depart_st_pancras'], 'arrive_destination': es['arrive_destination'], @@ -155,6 +155,14 @@ def find_unreachable_morning_eurostars( unreachable = [] for es in eurostar_trains: + try: + dep_stp = _parse_dt(travel_date, es['depart_st_pancras']) + except (ValueError, KeyError): + continue + + if dep_stp.hour >= MORNING_CUTOFF_HOUR: + continue + if any( _is_viable_connection( gwr,