diff --git a/archivebox/legacy/config.py b/archivebox/legacy/config.py index 9ef9e602..490f0a4b 100644 --- a/archivebox/legacy/config.py +++ b/archivebox/legacy/config.py @@ -428,6 +428,7 @@ def check_dependencies() -> None: stderr('{red}[X] Missing some required dependencies.{reset}'.format(**ANSI)) raise SystemExit(1) +def check_data_folder() -> None: if HAS_INVALID_DB: stderr('{red}[X] No archive data found in:{reset} {}'.format(OUTPUT_DIR, **ANSI)) stderr(' Are you running archivebox in the right folder?') diff --git a/archivebox/legacy/main.py b/archivebox/legacy/main.py index 3f2f21a5..fab5a7c5 100644 --- a/archivebox/legacy/main.py +++ b/archivebox/legacy/main.py @@ -12,10 +12,10 @@ from .index import ( ) from .archive_methods import archive_link from .config import ( - ANSI, ONLY_NEW, OUTPUT_DIR, check_dependencies, + check_data_folder, ) from .logs import ( log_archiving_started, @@ -33,6 +33,7 @@ def update_archive_data(import_path: Optional[str]=None, resume: Optional[float] """The main ArchiveBox entrancepoint. Everything starts here.""" check_dependencies() + check_data_folder() # Step 1: Load list of links from the existing index # merge in and dedupe new links from import_path @@ -107,6 +108,8 @@ def remove_archive_links(filter_patterns: List[str], filter_type: str='exact', yes: bool=False, delete: bool=False) -> List[Link]: check_dependencies() + check_data_folder() + log_list_started(filter_patterns, filter_type) timer = TimedProgress(360, prefix=' ') try: diff --git a/archivebox/legacy/schema.py b/archivebox/legacy/schema.py index 08fb6b70..d139353e 100644 --- a/archivebox/legacy/schema.py +++ b/archivebox/legacy/schema.py @@ -69,7 +69,7 @@ class ArchiveResult: cols = cols or self.field_names() return separator.join( - to_json(getattr(self, col), indent=False).ljust(ljust) + to_json(getattr(self, col), indent=None).ljust(ljust) for col in cols )