The_Great_Archive/ArchiveBox
1
0
Fork 0
mirror of https://github.com/ArchiveBox/ArchiveBox.git synced 2026-09-14 11:06:13 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix archive URL latest snapshot redirect

Browse Source
This commit is contained in:
Nick Sweeting 2026-08-27 11:37:18 -07:00
parent 3a7354d230
commit 93a13c35f6
No known key found for this signature in database
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
archivebox/core/views.py
View File

@ -638,8 +638,14 @@ class SnapshotView(View):
return id_qs
return SnapshotView.find_snapshots_for_url(slug)
snapshots = direct_snapshots_queryset(request, _resolve_snapshots_for_slug(path))
try:
snapshot = direct_snapshots_queryset(request, _resolve_snapshots_for_slug(path)).get()
if "://" in path:
snapshot = snapshots.order_by("-bookmarked_at").first()
if snapshot is None:
raise Snapshot.DoesNotExist
else:
snapshot = snapshots.get()
except Snapshot.DoesNotExist:
return HttpResponse(
format_html(
@ -658,7 +664,6 @@ class SnapshotView(View):
status=404,
)
except Snapshot.MultipleObjectsReturned:
snapshots = direct_snapshots_queryset(request, _resolve_snapshots_for_slug(path))
snapshot_hrefs = mark_safe("<br/>").join(
format_html(
'{} <code style="font-size: 0.8em">{}</code> <a href="/{}/index.html"><b><code>{}</code></b></a> {} <b>{}</b>',

10
archivebox/tests/test_ui_public_snapshot.py
View File

@ -209,22 +209,20 @@ def _create_public_snapshot_with_cli(data_dir, url: str) -> str:
@override_settings(PUBLIC_INDEX=True)
def test_archive_url_with_multiple_snapshots_shows_snapshot_picker(client, admin_user):
def test_archive_url_with_multiple_snapshots_redirects_to_latest_snapshot(client, admin_user):
from archivebox.core.models import Snapshot
from archivebox.crawls.models import Crawl
url = "https://multiple-public-snapshots.example/page"
first_crawl = Crawl.objects.create(urls=url, created_by=admin_user, config={"PERMISSIONS": "public"})
second_crawl = Crawl.objects.create(urls=url, created_by=admin_user, config={"PERMISSIONS": "public"})
first = Snapshot.objects.create(url=url, title="First copy", crawl=first_crawl, status=Snapshot.StatusChoices.SEALED)
Snapshot.objects.create(url=url, title="First copy", crawl=first_crawl, status=Snapshot.StatusChoices.SEALED)
second = Snapshot.objects.create(url=url, title="Second copy", crawl=second_crawl, status=Snapshot.StatusChoices.SEALED)
response = client.get(f"/archive/{url}", HTTP_HOST=WEB_TEST_HOST)
assert response.status_code == 404
assert b"Multiple Snapshots match the given URL" in response.content
assert first.archive_path.encode() in response.content
assert second.archive_path.encode() in response.content
assert response.status_code == 302
assert response["Location"] == f"/{second.archive_path}/index.html"
def _login_admin_session_over_http(port: int, host: str) -> requests.Session: