瀏覽代碼

fix: Handle case when update tries to re-add a link that is not in the sql index

Cristian 5 年之前
父節點
當前提交
d064a3eeff
共有 2 個文件被更改,包括 7 次插入2 次删除
  1. 5 1
      archivebox/extractors/__init__.py
  2. 2 1
      tests/test_update.py

+ 5 - 1
archivebox/extractors/__init__.py

@@ -8,6 +8,7 @@ from datetime import datetime
 from django.db.models import QuerySet
 
 from ..index.schema import Link
+from ..index.sql import write_link_to_sql_index
 from ..index import (
     load_link_details,
     write_link_details,
@@ -68,7 +69,10 @@ def archive_link(link: Link, overwrite: bool=False, methods: Optional[Iterable[s
     # TODO: Remove when the input is changed to be a snapshot. Suboptimal approach.
     if not skip_index:
         from core.models import Snapshot, ArchiveResult
-        snapshot = Snapshot.objects.get(url=link.url)
+        try:
+            snapshot = Snapshot.objects.get(url=link.url) # TODO: This will be unnecessary once everything is a snapshot
+        except Snapshot.DoesNotExist:
+            write_link_to_sql_index(link)
 
     ARCHIVE_METHODS = get_default_archive_methods()
     

+ 2 - 1
tests/test_update.py

@@ -6,7 +6,7 @@ def test_update_status_invalid(tmp_path, process, disable_extractors_dict):
     subprocess.run(['archivebox', 'add', 'http://127.0.0.1:8080/static/example.com.html'], capture_output=True, env=disable_extractors_dict)
     assert list((tmp_path / "archive").iterdir()) != []
 
-    subprocess.run(['archivebox', 'remove', 'http://127.0.0.1:8080/static/example.com.html', '--yes'], capture_output=True)
+    a_process = subprocess.run(['archivebox', 'remove', 'http://127.0.0.1:8080/static/example.com.html', '--yes'], capture_output=True)
 
     conn = sqlite3.connect(str(tmp_path / "index.sqlite3"))
     c = conn.cursor()
@@ -17,6 +17,7 @@ def test_update_status_invalid(tmp_path, process, disable_extractors_dict):
     assert link is None
 
     update_process = subprocess.run(['archivebox', 'update', '--status=invalid'], capture_output=True, env=disable_extractors_dict)
+    #breakpoint()
 
     conn = sqlite3.connect(str(tmp_path / "index.sqlite3"))
     c = conn.cursor()