mirrors/ArchiveBox
1
0
Fork 0
mirror of https://github.com/ArchiveBox/ArchiveBox.git synced 2024-09-19 15:38:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

support loading link indexes with extra keys

Browse source
This commit is contained in:
Nick Sweeting 2019-03-27 10:31:07 -04:00
parent 98870ba428
commit 19e1c35f1a
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
archivebox/index.py
View file

@ -120,12 +120,18 @@ def write_json_links_index(out_dir: str, links: List[Link]) -> None:
def parse_json_links_index(out_dir: str=OUTPUT_DIR) -> Iterator[Link]:
"""parse a archive index json file and return the list of links"""
allowed_fields = {f.name for f in fields(Link)}
index_path = os.path.join(out_dir, 'index.json')
if os.path.exists(index_path):
with open(index_path, 'r', encoding='utf-8') as f:
links = json.load(f)['links']
for link in links:
yield Link(**link)
for link_json in links:
yield Link(**{
key: val
for key, val in link_json.items()
if key in allowed_fields
})
return ()

4
archivebox/schema.py
View file

@ -164,7 +164,7 @@ class Link:
from util import ts_to_date
most_recent = min(
(result.start_ts
(ts_to_date(result.start_ts)
for method in self.history.keys()
for result in self.history[method]),
default=None,
@ -176,7 +176,7 @@ class Link:
from util import ts_to_date
most_recent = max(
(result.start_ts
(ts_to_date(result.start_ts)
for method in self.history.keys()
for result in self.history[method]),
default=None,