fix sql link parsing and writing

archivebox/legacy/index.py

@@ -245,10 +245,12 @@ def load_main_index(out_dir: str=OUTPUT_DIR, warn: bool=True) -> List[Link]:
 
     all_links: List[Link] = []
     all_links = list(parse_json_main_index(out_dir))
-    links_from_sql = list(parse_sql_main_index())
+    links_from_sql = list(parse_sql_main_index(out_dir))
 
-    if warn and not set(l.url for l in all_links) == set(l['url'] for l in links_from_sql):
+    if warn and not set(l.url for l in all_links) == set(l.url for l in links_from_sql):
         stderr('{red}[!] Warning: SQL index does not match JSON index!{reset}'.format(**ANSI))
+        stderr('    To repair the index and re-import any orphaned links run:')
+        stderr('        archivebox init')
 
     return all_links
 

archivebox/legacy/logs.py

@@ -60,7 +60,7 @@ def log_indexing_process_started(num_links: int):
     start_ts = datetime.now()
     _LAST_RUN_STATS.index_start_ts = start_ts
     print()
-    print('{green}[*] [{}] Updating {} links in main index...{reset}'.format(
+    print('{green}[*] [{}] Writing {} links to main index...{reset}'.format(
         start_ts.strftime('%Y-%m-%d %H:%M:%S'),
         num_links,
         **ANSI,

archivebox/legacy/storage/sql.py

@@ -15,7 +15,7 @@ def parse_sql_main_index(out_dir: str=OUTPUT_DIR) -> Iterator[Link]:
     from core.models import Page
 
     return (
-        page.as_json(*Page.keys)
+        Link.from_json(page.as_json(*Page.keys))
         for page in Page.objects.all()
     )