mirrors/ArchiveBox
1
0
Fork 0
mirror of https://github.com/ArchiveBox/ArchiveBox.git synced 2025-05-13 14:44:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix snapshot uuid

Browse source
This commit is contained in:
Nick Sweeting 2024-08-18 01:07:21 -07:00
parent 8c50257fe9
commit 57d31b2b14
No known key found for this signature in database
4 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
archivebox/api/v1_core.py
View file

@ -77,7 +77,7 @@ class ArchiveResultFilterSchema(FilterSchema):
id: Optional[UUID] = Field(None, q='id') id: Optional[UUID] = Field(None, q='id')
search: Optional[str] = Field(None, q=['snapshot__url__icontains', 'snapshot__title__icontains', 'snapshot__tags__name__icontains', 'extractor', 'output__icontains']) search: Optional[str] = Field(None, q=['snapshot__url__icontains', 'snapshot__title__icontains', 'snapshot__tags__name__icontains', 'extractor', 'output__icontains'])
snapshot_uuid: Optional[UUID] = Field(None, q='snapshot_uuid__icontains') snapshot_id: Optional[UUID] = Field(None, q='snapshot_id__icontains')
snapshot_url: Optional[str] = Field(None, q='snapshot__url__icontains') snapshot_url: Optional[str] = Field(None, q='snapshot__url__icontains')
snapshot_tag: Optional[str] = Field(None, q='snapshot__tags__name__icontains') snapshot_tag: Optional[str] = Field(None, q='snapshot__tags__name__icontains')
@ -227,7 +227,7 @@ def get_snapshot(request, snapshot_id: str, with_archiveresults: bool=True):
request.with_archiveresults = with_archiveresults request.with_archiveresults = with_archiveresults
snapshot = None snapshot = None
try: try:
snapshot = Snapshot.objects.get(Q(uuid__startswith=snapshot_id) | Q(abid__startswith=snapshot_id)| Q(pk__startswith=snapshot_id)) snapshot = Snapshot.objects.get(Q(abid__startswith=snapshot_id)| Q(pk__startswith=snapshot_id))
except Snapshot.DoesNotExist: except Snapshot.DoesNotExist:
pass pass
@ -237,7 +237,7 @@ def get_snapshot(request, snapshot_id: str, with_archiveresults: bool=True):
pass pass
try: try:
snapshot = snapshot or Snapshot.objects.get(Q(uuid__icontains=snapshot_id) | Q(abid__icontains=snapshot_id)) snapshot = snapshot or Snapshot.objects.get(Q(pk__icontains=snapshot_id) | Q(abid__icontains=snapshot_id))
except Snapshot.DoesNotExist: except Snapshot.DoesNotExist:
pass pass

5
archivebox/core/admin.py
View file

@ -294,7 +294,10 @@ class SnapshotAdmin(SearchResultsAdminMixin, admin.ModelAdmin):
) )
def identifiers(self, obj): def identifiers(self, obj):
return get_abid_info(self, obj) try:
return get_abid_info(self, obj)
except Exception as e:
return str(e)
@admin.display( @admin.display(
description='Title', description='Title',

5
archivebox/core/models.py
View file

@ -140,6 +140,9 @@ class Snapshot(ABIDModel):
keys = ('url', 'timestamp', 'title', 'tags', 'updated') keys = ('url', 'timestamp', 'title', 'tags', 'updated')
@property
def uuid(self):
return self.id
def __repr__(self) -> str: def __repr__(self) -> str:
title = self.title or '-' title = self.title or '-'
@ -354,7 +357,7 @@ class ArchiveResult(ABIDModel):
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=True, unique=True, verbose_name='ID') id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=True, unique=True, verbose_name='ID')
abid = ABIDField(prefix=abid_prefix) abid = ABIDField(prefix=abid_prefix)
snapshot = models.ForeignKey(Snapshot, on_delete=models.CASCADE, to_field='id') snapshot = models.ForeignKey(Snapshot, on_delete=models.CASCADE, to_field='id', db_column='snapshot_id')
extractor = models.CharField(choices=EXTRACTOR_CHOICES, max_length=32) extractor = models.CharField(choices=EXTRACTOR_CHOICES, max_length=32)
cmd = models.JSONField() cmd = models.JSONField()

2
archivebox/index/schema.py
View file

@ -274,7 +274,7 @@ class Link:
@cached_property @cached_property
def snapshot_uuid(self): def snapshot_uuid(self):
return str(self.snapshot.uuid) return str(self.snapshot.id)
@cached_property @cached_property
def snapshot_abid(self): def snapshot_abid(self):