From c16fdf1b47c13f024f82a3488a985e8af6317a3e Mon Sep 17 00:00:00 2001 From: Cristian Date: Tue, 18 Aug 2020 12:53:46 -0500 Subject: [PATCH] feat: Update data folder check --- archivebox/config/__init__.py | 5 ++--- archivebox/index/__init__.py | 3 --- archivebox/main.py | 1 - 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/archivebox/config/__init__.py b/archivebox/config/__init__.py index 9882045f..3fa5e090 100644 --- a/archivebox/config/__init__.py +++ b/archivebox/config/__init__.py @@ -878,8 +878,8 @@ def check_data_folder(out_dir: Optional[str]=None, config: ConfigDict=CONFIG) -> output_dir = out_dir or config['OUTPUT_DIR'] assert isinstance(output_dir, str) - json_index_exists = os.path.exists(os.path.join(output_dir, JSON_INDEX_FILENAME)) - if not json_index_exists: + sql_index_exists = os.path.exists(os.path.join(output_dir, SQL_INDEX_FILENAME)) + if not sql_index_exists: stderr('[X] No archivebox index found in the current directory.', color='red') stderr(f' {output_dir}', color='lightyellow') stderr() @@ -891,7 +891,6 @@ def check_data_folder(out_dir: Optional[str]=None, config: ConfigDict=CONFIG) -> stderr(' archivebox init') raise SystemExit(2) - sql_index_exists = os.path.exists(os.path.join(output_dir, SQL_INDEX_FILENAME)) from ..index.sql import list_migrations pending_migrations = [name for status, name in list_migrations() if not status] diff --git a/archivebox/index/__init__.py b/archivebox/index/__init__.py index fb5ec6ec..022c83b4 100644 --- a/archivebox/index/__init__.py +++ b/archivebox/index/__init__.py @@ -11,7 +11,6 @@ from collections import OrderedDict from contextlib import contextmanager from urllib.parse import urlparse -from ..system import atomic_write from ..util import ( scheme, enforce_types, @@ -25,7 +24,6 @@ from ..config import ( OUTPUT_DIR, TIMEOUT, URL_BLACKLIST_PTN, - ANSI, stderr, OUTPUT_PERMISSIONS ) @@ -45,7 +43,6 @@ from .html import ( write_html_link_details, ) from .json import ( - parse_json_main_index, write_json_main_index, parse_json_link_details, write_json_link_details, diff --git a/archivebox/main.py b/archivebox/main.py index c6c371c5..406fd2e0 100644 --- a/archivebox/main.py +++ b/archivebox/main.py @@ -47,7 +47,6 @@ from .index.json import ( parse_json_links_details, ) from .index.sql import ( - parse_sql_main_index, get_admins, apply_migrations, remove_from_sql_main_index,