From 0f13087a0949800a54753880c1dc5d35c95bef05 Mon Sep 17 00:00:00 2001
From: Cristian <cristian@swapps.com>
Date: Thu, 12 Nov 2020 13:58:13 -0500
Subject: [PATCH] refactor: Remove unneeded prefetch related
---
archivebox/core/utils.py | 5 ++---
archivebox/core/views.py | 1 -
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/archivebox/core/utils.py b/archivebox/core/utils.py
index 14c40eaf..3c310525 100644
--- a/archivebox/core/utils.py
+++ b/archivebox/core/utils.py
@@ -1,12 +1,11 @@
from django.utils.html import format_html
from core.models import Snapshot, EXTRACTORS
-from core.settings import DEBUG
from pathlib import Path
def get_icons(snapshot: Snapshot) -> str:
- archive_results = list(snapshot.archiveresult_set.all())
+ archive_results = snapshot.archiveresult_set.filter(status="succeeded")
link = snapshot.as_link()
canon = link.canonical_outputs()
output = ""
@@ -29,7 +28,7 @@ def get_icons(snapshot: Snapshot) -> str:
for extractor, _ in EXTRACTORS:
for result in archive_results:
- if result.extractor != extractor or result.status != "succeeded":
+ if result.extractor != extractor:
continue
path = link.archive_path
try:
diff --git a/archivebox/core/views.py b/archivebox/core/views.py
index ee540821..7cd8b104 100644
--- a/archivebox/core/views.py
+++ b/archivebox/core/views.py
@@ -98,7 +98,6 @@ class PublicArchiveView(ListView):
query = self.request.GET.get('q')
if query:
qs = Snapshot.objects.filter(title__icontains=query)
- qs = qs.prefetch_related("archiveresult_set").all()
for snapshot in qs:
snapshot.icons = get_icons(snapshot)
return qs