From 784dab3d412431f93911c7479f6cf85faed0d6b8 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 10 Nov 2022 11:40:20 -0800 Subject: [PATCH] Fixes to how import times are estimated The wrong attr was being used to grab the number of seconds, and imports that were stopped were being counted --- bookwyrm/views/imports/import_data.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bookwyrm/views/imports/import_data.py b/bookwyrm/views/imports/import_data.py index 60a5a244f..c126ed1d0 100644 --- a/bookwyrm/views/imports/import_data.py +++ b/bookwyrm/views/imports/import_data.py @@ -45,7 +45,9 @@ class Import(View): last_week = timezone.now() - datetime.timedelta(days=7) recent_avg = ( - models.ImportJob.objects.filter(created_date__gte=last_week, complete=True) + models.ImportJob.objects.filter( + created_date__gte=last_week, status="complete" + ) .annotate( runtime=ExpressionWrapper( F("updated_date") - F("created_date"), @@ -58,9 +60,9 @@ class Import(View): if recent_avg: seconds = recent_avg.total_seconds() if seconds > 60**2: - data["recent_avg_hours"] = recent_avg.seconds / (60**2) + data["recent_avg_hours"] = seconds / (60**2) else: - data["recent_avg_minutes"] = recent_avg.seconds / 60 + data["recent_avg_minutes"] = seconds / 60 return TemplateResponse(request, "import/import.html", data)