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

add snapshot_id to Link and uuid to ArchiveResult

Browse source
This commit is contained in:
Nick Sweeting 2021-02-16 15:54:27 -05:00
parent 0b8bdd8cc5
commit 05e891632c
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
archivebox/core/models.py
View file

@ -79,7 +79,7 @@ class Snapshot(models.Model):
title = models.CharField(max_length=128, null=True, blank=True, db_index=True) title = models.CharField(max_length=128, null=True, blank=True, db_index=True)
added = models.DateTimeField(auto_now_add=True, db_index=True) added = models.DateTimeField(auto_now_add=True, db_index=True)
updated = models.DateTimeField(null=True, blank=True, db_index=True) updated = models.DateTimeField(auto_now=True, blank=True, null=True, db_index=True)
tags = models.ManyToManyField(Tag) tags = models.ManyToManyField(Tag)
keys = ('url', 'timestamp', 'title', 'tags', 'updated') keys = ('url', 'timestamp', 'title', 'tags', 'updated')
@ -205,12 +205,15 @@ class ArchiveResultManager(models.Manager):
class ArchiveResult(models.Model): class ArchiveResult(models.Model):
id = models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')
uuid = models.UUIDField(default=uuid.uuid4, editable=False)
snapshot = models.ForeignKey(Snapshot, on_delete=models.CASCADE) snapshot = models.ForeignKey(Snapshot, on_delete=models.CASCADE)
cmd = JSONField() cmd = JSONField()
pwd = models.CharField(max_length=256) pwd = models.CharField(max_length=256)
cmd_version = models.CharField(max_length=32, default=None, null=True, blank=True) cmd_version = models.CharField(max_length=128, default=None, null=True, blank=True)
output = models.CharField(max_length=512) output = models.CharField(max_length=1024)
start_ts = models.DateTimeField() start_ts = models.DateTimeField(db_index=True)
end_ts = models.DateTimeField() end_ts = models.DateTimeField()
status = models.CharField(max_length=16, choices=STATUS_CHOICES) status = models.CharField(max_length=16, choices=STATUS_CHOICES)
extractor = models.CharField(choices=EXTRACTORS, max_length=32) extractor = models.CharField(choices=EXTRACTORS, max_length=32)

7
archivebox/index/schema.py
View file

@ -178,6 +178,7 @@ class Link:
raise raise
def _asdict(self, extended=False): def _asdict(self, extended=False):
from core.models import Snapshot
info = { info = {
'schema': 'Link', 'schema': 'Link',
'url': self.url, 'url': self.url,
@ -190,6 +191,7 @@ class Link:
} }
if extended: if extended:
info.update({ info.update({
'snapshot_id': self.snapshot_id,
'link_dir': self.link_dir, 'link_dir': self.link_dir,
'archive_path': self.archive_path, 'archive_path': self.archive_path,
@ -258,6 +260,11 @@ class Link:
return to_csv(self, cols=cols or self.field_names(), separator=separator, ljust=ljust) return to_csv(self, cols=cols or self.field_names(), separator=separator, ljust=ljust)
@cached_property
def snapshot_id(self):
from core.models import Snapshot
return str(Snapshot.objects.only('id').get(url=self.url).id)
@classmethod @classmethod
def field_names(cls): def field_names(cls):
return [f.name for f in fields(cls)] return [f.name for f in fields(cls)]