From 7bf63d91ff2c4bed58b0037ffa162a59a46d3391 Mon Sep 17 00:00:00 2001 From: Tim Gates Date: Sat, 26 Dec 2020 11:31:03 +1100 Subject: [PATCH 1/4] docs: fix simple typo, timstamp -> timestamp There is a small typo in archivebox/index/__init__.py. Should read `timestamp` rather than `timstamp`. --- archivebox/index/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archivebox/index/__init__.py b/archivebox/index/__init__.py index 4f4ac3d4..8eab1d38 100644 --- a/archivebox/index/__init__.py +++ b/archivebox/index/__init__.py @@ -124,7 +124,7 @@ def validate_links(links: Iterable[Link]) -> List[Link]: timer = TimedProgress(TIMEOUT * 4) try: links = archivable_links(links) # remove chrome://, about:, mailto: etc. - links = sorted_links(links) # deterministically sort the links based on timstamp, url + links = sorted_links(links) # deterministically sort the links based on timestamp, url links = fix_duplicate_links(links) # merge/dedupe duplicate timestamps & urls finally: timer.end() From ad7849d3199e76cca6117afceb055e7f50e59d60 Mon Sep 17 00:00:00 2001 From: Matt Sweeney Date: Fri, 1 Jan 2021 10:54:46 -0800 Subject: [PATCH 2/4] Corrected spelling error in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 29f23f74..2e357831 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@
-ArchiveBox is a powerful self-hosted internet archiving solution written in Python 3. You feed it URLs of pages you want to archive, and it saves them to disk in a varitety of formats depending on the configuration and the content it detects. +ArchiveBox is a powerful self-hosted internet archiving solution written in Python 3. You feed it URLs of pages you want to archive, and it saves them to disk in a variety of formats depending on the configuration and the content it detects. Your archive can be managed through the command line with commands like `archivebox add`, through the built-in Web UI `archivebox server`, or via the Python library API (beta). It can ingest bookmarks from a browser or service like Pocket/Pinboard, your entire browsing history, RSS feeds, or URLs one at a time. You can also schedule regular/realtime imports with `archivebox schedule`. From c21af37ed4c528d36d1553486350d6a40e6bda44 Mon Sep 17 00:00:00 2001 From: Cristian Date: Mon, 4 Jan 2021 10:00:53 -0500 Subject: [PATCH 3/4] fix: Give cmd_version a default value in case it is not present --- .../core/migrations/0008_auto_20210104_1458.py | 18 ++++++++++++++++++ archivebox/core/models.py | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 archivebox/core/migrations/0008_auto_20210104_1458.py diff --git a/archivebox/core/migrations/0008_auto_20210104_1458.py b/archivebox/core/migrations/0008_auto_20210104_1458.py new file mode 100644 index 00000000..83914b3b --- /dev/null +++ b/archivebox/core/migrations/0008_auto_20210104_1458.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.3 on 2021-01-04 14:58 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0007_archiveresult'), + ] + + operations = [ + migrations.AlterField( + model_name='archiveresult', + name='cmd_version', + field=models.CharField(default='', max_length=32), + ), + ] diff --git a/archivebox/core/models.py b/archivebox/core/models.py index d50e8f40..9238f7f8 100644 --- a/archivebox/core/models.py +++ b/archivebox/core/models.py @@ -181,7 +181,7 @@ class ArchiveResult(models.Model): snapshot = models.ForeignKey(Snapshot, on_delete=models.CASCADE) cmd = JSONField() pwd = models.CharField(max_length=256) - cmd_version = models.CharField(max_length=32) + cmd_version = models.CharField(max_length=32, default="") output = models.CharField(max_length=512) start_ts = models.DateTimeField() end_ts = models.DateTimeField() From 14d1b3209ee14d4d76228587d88eff0e4bf9d796 Mon Sep 17 00:00:00 2001 From: Cristian Date: Tue, 5 Jan 2021 09:23:19 -0500 Subject: [PATCH 4/4] fix: Make cmd_version nullable --- ...{0008_auto_20210104_1458.py => 0008_auto_20210105_1421.py} | 4 ++-- archivebox/core/models.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename archivebox/core/migrations/{0008_auto_20210104_1458.py => 0008_auto_20210105_1421.py} (68%) diff --git a/archivebox/core/migrations/0008_auto_20210104_1458.py b/archivebox/core/migrations/0008_auto_20210105_1421.py similarity index 68% rename from archivebox/core/migrations/0008_auto_20210104_1458.py rename to archivebox/core/migrations/0008_auto_20210105_1421.py index 83914b3b..e5b3387d 100644 --- a/archivebox/core/migrations/0008_auto_20210104_1458.py +++ b/archivebox/core/migrations/0008_auto_20210105_1421.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.3 on 2021-01-04 14:58 +# Generated by Django 3.1.3 on 2021-01-05 14:21 from django.db import migrations, models @@ -13,6 +13,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='archiveresult', name='cmd_version', - field=models.CharField(default='', max_length=32), + field=models.CharField(blank=True, default=None, max_length=32, null=True), ), ] diff --git a/archivebox/core/models.py b/archivebox/core/models.py index 9238f7f8..13d75b66 100644 --- a/archivebox/core/models.py +++ b/archivebox/core/models.py @@ -181,7 +181,7 @@ class ArchiveResult(models.Model): snapshot = models.ForeignKey(Snapshot, on_delete=models.CASCADE) cmd = JSONField() pwd = models.CharField(max_length=256) - cmd_version = models.CharField(max_length=32, default="") + cmd_version = models.CharField(max_length=32, default=None, null=True, blank=True) output = models.CharField(max_length=512) start_ts = models.DateTimeField() end_ts = models.DateTimeField()