From c584d60f37146a208d8f476f3a4ada815efbad68 Mon Sep 17 00:00:00 2001 From: Jon Michael Aanes Date: Mon, 27 Jan 2025 00:36:30 +0100 Subject: [PATCH] Separate stuff --- package_tracking/http.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/package_tracking/http.py b/package_tracking/http.py index 73d2ec5..1dfb357 100644 --- a/package_tracking/http.py +++ b/package_tracking/http.py @@ -142,7 +142,7 @@ footer { TODAY = datetime.datetime.now(tz=datetime.UTC).date() -def render_tracking(with_form: bool): +def get_packages_from_parcels(): tracking_entries = database.get_tracking_numbers() tracking_numbers = [e.number for e in tracking_entries] @@ -157,9 +157,12 @@ def render_tracking(with_form: bool): result.tracking_number: result for result in tracking_results } - tracking_results_with_name = [(e, tracking_results_by_id.get(e.number)) for e in tracking_entries] - tracking_results_with_name.sort(key=lambda x: x[1].latest_state().date if x[1] else TODAY, reverse=True) + return [(e, tracking_results_by_id.get(e.number)) for e in tracking_entries] + +def render_tracking(tracking_results_with_name, error_message: str | None, with_form: bool): + tracking_results_with_name = get_packages_from_parcels() + tracking_results_with_name.sort(key=lambda x: x[1].latest_state().date if x[1] else TODAY, reverse=True) return bottle.template(TEMPLATE, error_message=error_message, tracking_results=tracking_results_with_name, with_form=with_form) @bottle.route('/') @@ -171,6 +174,7 @@ def inner(): return render_tracking(with_form=False) + @bottle.route('/add', method='POST') def add_tracking_number(): number: str = bottle.request.forms.get('tracking-number')