alex/ArchiveBox
1
0
Fork 0
mirror of https://github.com/ArchiveBox/ArchiveBox.git synced 2026-04-06 07:47:53 +10:00
Code Issues Packages Projects Releases Wiki Activity

migrate SnapshotTag to use new snapshot id

Browse Source
This commit is contained in:
Nick Sweeting
2024-08-19 19:42:25 -07:00
parent 74c11d41be
commit 344e902fc6
12 changed files with 251 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
archivebox/core/models.py
View File

@@ -121,8 +121,8 @@ class Tag(ABIDModel):
class SnapshotTag(models.Model):
id = models.AutoField(primary_key=True)
snapshot = models.OneToOneField('Snapshot', on_delete=models.CASCADE, to_field='old_id')
tag = models.ForeignKey(Tag, on_delete=models.CASCADE, to_field='id')
snapshot = models.ForeignKey('Snapshot', db_column='snapshot_id', on_delete=models.CASCADE, to_field='id')
tag = models.ForeignKey(Tag, db_column='tag_id', on_delete=models.CASCADE, to_field='id')
class Meta:
db_table = 'core_snapshot_tags'
@@ -135,12 +135,12 @@ class Snapshot(ABIDModel):
abid_subtype_src = '"01"'
abid_rand_src = 'self.old_id'
old_id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) # legacy pk
id = models.UUIDField(default=uuid.uuid4, editable=True, unique=True)
old_id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True) # legacy pk
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=True, unique=True)
abid = ABIDField(prefix=abid_prefix)
url = models.URLField(unique=True, db_index=True)
timestamp = models.CharField(max_length=32, unique=True, db_index=True)
timestamp = models.CharField(max_length=32, unique=True, db_index=True, editable=False)
title = models.CharField(max_length=512, null=True, blank=True, db_index=True)
@@ -365,6 +365,7 @@ class ArchiveResult(ABIDModel):
EXTRACTOR_CHOICES = EXTRACTOR_CHOICES
old_id = models.BigIntegerField(default=rand_int_id, serialize=False, verbose_name='Old ID')
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=True, unique=True, verbose_name='ID')
abid = ABIDField(prefix=abid_prefix)
@@ -392,6 +393,10 @@ class ArchiveResult(ABIDModel):
super().save(*args, **kwargs)
assert str(self.id) == str(self.abid.uuid)
@property
def uuid(self):
return self.id
@cached_property
def snapshot_dir(self):
return Path(self.snapshot.link_dir)