forks/archivebox
1
0
Fork 0
Code Releases Activity

fix: Add notice for issues with index detail

Browse source
This commit is contained in:
Cristian 2020-07-22 17:08:32 -05:00
parent 36124f2dfe
commit 71f5f03a20
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
archivebox/index/__init__.py
View file

@ -583,7 +583,10 @@ def fix_invalid_folder_locations(out_dir: str=OUTPUT_DIR) -> Tuple[List[str], Li
for entry in os.scandir(os.path.join(out_dir, ARCHIVE_DIR_NAME)): for entry in os.scandir(os.path.join(out_dir, ARCHIVE_DIR_NAME)):
if entry.is_dir(follow_symlinks=True): if entry.is_dir(follow_symlinks=True):
if os.path.exists(os.path.join(entry.path, 'index.json')): if os.path.exists(os.path.join(entry.path, 'index.json')):
link = parse_json_link_details(entry.path) try:
link = parse_json_link_details(entry.path)
except KeyError:
link = None
if not link: if not link:
continue continue

15
archivebox/index/json.py
View file

@ -19,6 +19,7 @@ from ..config import (
DEPENDENCIES, DEPENDENCIES,
JSON_INDEX_FILENAME, JSON_INDEX_FILENAME,
ARCHIVE_DIR_NAME, ARCHIVE_DIR_NAME,
ANSI
) )
@ -53,9 +54,12 @@ def parse_json_main_index(out_dir: str=OUTPUT_DIR) -> Iterator[Link]:
try: try:
yield Link.from_json(link_json) yield Link.from_json(link_json)
except KeyError: except KeyError:
detail_index_path = Path(OUTPUT_DIR) / ARCHIVE_DIR_NAME / link_json['timestamp'] try:
yield parse_json_link_details(str(detail_index_path)) detail_index_path = Path(f"{OUTPUT_DIR}/{ARCHIVE_DIR_NAME}/{link_json['timestamp']}")
yield parse_json_link_details(str(detail_index_path))
except KeyError:
print(" {lightyellow}! Failed to retrieve index from {}. The index may be corrupt.".format(detail_index_path, **ANSI))
continue
return () return ()
@enforce_types @enforce_types
@ -115,7 +119,10 @@ def parse_json_links_details(out_dir: str) -> Iterator[Link]:
for entry in os.scandir(os.path.join(out_dir, ARCHIVE_DIR_NAME)): for entry in os.scandir(os.path.join(out_dir, ARCHIVE_DIR_NAME)):
if entry.is_dir(follow_symlinks=True): if entry.is_dir(follow_symlinks=True):
if os.path.exists(os.path.join(entry.path, 'index.json')): if os.path.exists(os.path.join(entry.path, 'index.json')):
link = parse_json_link_details(entry.path) try:
link = parse_json_link_details(entry.path)
except KeyError:
link = None
if link: if link:
yield link yield link