diff --git a/archivebox/cli/__init__.py b/archivebox/cli/__init__.py index b7575c4a..ed050bfc 100644 --- a/archivebox/cli/__init__.py +++ b/archivebox/cli/__init__.py @@ -110,7 +110,7 @@ def main(args: Optional[List[str]]=NotProvided, stdin: Optional[IO]=NotProvided, command.subcommand = 'version' if command.subcommand not in ('help', 'version', 'status'): - from ..cli.logging import log_cli_command + from ..logging import log_cli_command log_cli_command( subcommand=command.subcommand, diff --git a/archivebox/cli/archivebox_add.py b/archivebox/cli/archivebox_add.py index 55832346..5fda755b 100644 --- a/archivebox/cli/archivebox_add.py +++ b/archivebox/cli/archivebox_add.py @@ -10,7 +10,7 @@ from typing import List, Optional, IO from ..main import add, docstring from ..config import OUTPUT_DIR, ONLY_NEW -from .logging import SmartFormatter, accept_stdin, stderr +from ..logging import SmartFormatter, accept_stdin, stderr @docstring(add.__doc__) diff --git a/archivebox/cli/archivebox_config.py b/archivebox/cli/archivebox_config.py index 314f84f5..dd422413 100644 --- a/archivebox/cli/archivebox_config.py +++ b/archivebox/cli/archivebox_config.py @@ -10,7 +10,7 @@ from typing import Optional, List, IO from ..main import config, docstring from ..config import OUTPUT_DIR -from .logging import SmartFormatter, accept_stdin +from ..logging import SmartFormatter, accept_stdin @docstring(config.__doc__) diff --git a/archivebox/cli/archivebox_help.py b/archivebox/cli/archivebox_help.py index 94f65c48..b20667be 100755 --- a/archivebox/cli/archivebox_help.py +++ b/archivebox/cli/archivebox_help.py @@ -10,7 +10,7 @@ from typing import Optional, List, IO from ..main import help, docstring from ..config import OUTPUT_DIR -from .logging import SmartFormatter, reject_stdin +from ..logging import SmartFormatter, reject_stdin @docstring(help.__doc__) diff --git a/archivebox/cli/archivebox_init.py b/archivebox/cli/archivebox_init.py index 5f39fba2..8a507cc7 100755 --- a/archivebox/cli/archivebox_init.py +++ b/archivebox/cli/archivebox_init.py @@ -10,7 +10,7 @@ from typing import Optional, List, IO from ..main import init, docstring from ..config import OUTPUT_DIR -from .logging import SmartFormatter, reject_stdin +from ..logging import SmartFormatter, reject_stdin @docstring(init.__doc__) diff --git a/archivebox/cli/archivebox_list.py b/archivebox/cli/archivebox_list.py index 45cb2407..c75519bf 100644 --- a/archivebox/cli/archivebox_list.py +++ b/archivebox/cli/archivebox_list.py @@ -22,7 +22,7 @@ from ..index import ( get_corrupted_folders, get_unrecognized_folders, ) -from .logging import SmartFormatter, accept_stdin +from ..logging import SmartFormatter, accept_stdin @docstring(list_all.__doc__) diff --git a/archivebox/cli/archivebox_remove.py b/archivebox/cli/archivebox_remove.py index 735ad52f..18e5915a 100644 --- a/archivebox/cli/archivebox_remove.py +++ b/archivebox/cli/archivebox_remove.py @@ -10,7 +10,7 @@ from typing import Optional, List, IO from ..main import remove, docstring from ..config import OUTPUT_DIR -from .logging import SmartFormatter, accept_stdin +from ..logging import SmartFormatter, accept_stdin @docstring(remove.__doc__) diff --git a/archivebox/cli/archivebox_schedule.py b/archivebox/cli/archivebox_schedule.py index be9a02a9..d459f86c 100644 --- a/archivebox/cli/archivebox_schedule.py +++ b/archivebox/cli/archivebox_schedule.py @@ -10,7 +10,7 @@ from typing import Optional, List, IO from ..main import schedule, docstring from ..config import OUTPUT_DIR -from .logging import SmartFormatter, reject_stdin +from ..logging import SmartFormatter, reject_stdin @docstring(schedule.__doc__) diff --git a/archivebox/cli/archivebox_server.py b/archivebox/cli/archivebox_server.py index 634bf732..ad65b459 100644 --- a/archivebox/cli/archivebox_server.py +++ b/archivebox/cli/archivebox_server.py @@ -10,7 +10,7 @@ from typing import Optional, List, IO from ..main import server, docstring from ..config import OUTPUT_DIR -from .logging import SmartFormatter, reject_stdin +from ..logging import SmartFormatter, reject_stdin @docstring(server.__doc__) diff --git a/archivebox/cli/archivebox_shell.py b/archivebox/cli/archivebox_shell.py index a053c7be..a1a9f874 100644 --- a/archivebox/cli/archivebox_shell.py +++ b/archivebox/cli/archivebox_shell.py @@ -10,7 +10,7 @@ from typing import Optional, List, IO from ..main import shell, docstring from ..config import OUTPUT_DIR -from .logging import SmartFormatter, reject_stdin +from ..logging import SmartFormatter, reject_stdin @docstring(shell.__doc__) diff --git a/archivebox/cli/archivebox_status.py b/archivebox/cli/archivebox_status.py index ac9b56d8..5d802e66 100644 --- a/archivebox/cli/archivebox_status.py +++ b/archivebox/cli/archivebox_status.py @@ -10,7 +10,7 @@ from typing import Optional, List, IO from ..main import status, docstring from ..config import OUTPUT_DIR -from .logging import SmartFormatter, reject_stdin +from ..logging import SmartFormatter, reject_stdin @docstring(status.__doc__) diff --git a/archivebox/cli/archivebox_update.py b/archivebox/cli/archivebox_update.py index 5088897d..f5e7a1fd 100644 --- a/archivebox/cli/archivebox_update.py +++ b/archivebox/cli/archivebox_update.py @@ -22,7 +22,7 @@ from ..index import ( get_corrupted_folders, get_unrecognized_folders, ) -from .logging import SmartFormatter, accept_stdin +from ..logging import SmartFormatter, accept_stdin @docstring(update.__doc__) diff --git a/archivebox/cli/archivebox_version.py b/archivebox/cli/archivebox_version.py index 50b5e5c2..fd1538a6 100755 --- a/archivebox/cli/archivebox_version.py +++ b/archivebox/cli/archivebox_version.py @@ -10,7 +10,7 @@ from typing import Optional, List, IO from ..main import version, docstring from ..config import OUTPUT_DIR -from .logging import SmartFormatter, reject_stdin +from ..logging import SmartFormatter, reject_stdin @docstring(version.__doc__) diff --git a/archivebox/core/admin.py b/archivebox/core/admin.py index 1b05c580..96438308 100644 --- a/archivebox/core/admin.py +++ b/archivebox/core/admin.py @@ -3,7 +3,7 @@ from django.utils.html import format_html from util import htmldecode, urldecode from core.models import Snapshot -from cli.logging import printable_filesize +from archivebox.logging import printable_filesize # TODO: https://stackoverflow.com/questions/40760880/add-custom-button-to-django-admin-panel diff --git a/archivebox/core/welcome_message.py b/archivebox/core/welcome_message.py index b257b7d6..0837e372 100644 --- a/archivebox/core/welcome_message.py +++ b/archivebox/core/welcome_message.py @@ -1,4 +1,4 @@ -from cli.logging import log_shell_welcome_msg +from archivebox.logging import log_shell_welcome_msg if __name__ == '__main__': diff --git a/archivebox/extractors/__init__.py b/archivebox/extractors/__init__.py index c9685a80..a440fe12 100644 --- a/archivebox/extractors/__init__.py +++ b/archivebox/extractors/__init__.py @@ -12,7 +12,7 @@ from ..index import ( patch_main_index, ) from ..util import enforce_types -from ..cli.logging import ( +from ..logging import ( log_archiving_started, log_archiving_paused, log_archiving_finished, diff --git a/archivebox/extractors/archive_org.py b/archivebox/extractors/archive_org.py index 185a01cb..656beb25 100644 --- a/archivebox/extractors/archive_org.py +++ b/archivebox/extractors/archive_org.py @@ -19,7 +19,7 @@ from ..config import ( CURL_VERSION, CURL_USER_AGENT, ) -from ..cli.logging import TimedProgress +from ..logging import TimedProgress diff --git a/archivebox/extractors/dom.py b/archivebox/extractors/dom.py index 63e24692..49589cf1 100644 --- a/archivebox/extractors/dom.py +++ b/archivebox/extractors/dom.py @@ -16,7 +16,7 @@ from ..config import ( SAVE_DOM, CHROME_VERSION, ) -from ..cli.logging import TimedProgress +from ..logging import TimedProgress diff --git a/archivebox/extractors/favicon.py b/archivebox/extractors/favicon.py index 2f5e87ba..cd0b568a 100644 --- a/archivebox/extractors/favicon.py +++ b/archivebox/extractors/favicon.py @@ -15,7 +15,7 @@ from ..config import ( CHECK_SSL_VALIDITY, CURL_USER_AGENT, ) -from ..cli.logging import TimedProgress +from ..logging import TimedProgress @enforce_types diff --git a/archivebox/extractors/git.py b/archivebox/extractors/git.py index c8a5eeaf..f897c097 100644 --- a/archivebox/extractors/git.py +++ b/archivebox/extractors/git.py @@ -22,7 +22,7 @@ from ..config import ( GIT_DOMAINS, CHECK_SSL_VALIDITY ) -from ..cli.logging import TimedProgress +from ..logging import TimedProgress diff --git a/archivebox/extractors/media.py b/archivebox/extractors/media.py index 554f27c9..9c4d4a09 100644 --- a/archivebox/extractors/media.py +++ b/archivebox/extractors/media.py @@ -18,7 +18,7 @@ from ..config import ( YOUTUBEDL_VERSION, CHECK_SSL_VALIDITY ) -from ..cli.logging import TimedProgress +from ..logging import TimedProgress @enforce_types diff --git a/archivebox/extractors/pdf.py b/archivebox/extractors/pdf.py index bd8093bf..a63c24c8 100644 --- a/archivebox/extractors/pdf.py +++ b/archivebox/extractors/pdf.py @@ -16,7 +16,7 @@ from ..config import ( SAVE_PDF, CHROME_VERSION, ) -from ..cli.logging import TimedProgress +from ..logging import TimedProgress @enforce_types diff --git a/archivebox/extractors/screenshot.py b/archivebox/extractors/screenshot.py index 33936499..217dc77f 100644 --- a/archivebox/extractors/screenshot.py +++ b/archivebox/extractors/screenshot.py @@ -16,7 +16,7 @@ from ..config import ( SAVE_SCREENSHOT, CHROME_VERSION, ) -from ..cli.logging import TimedProgress +from ..logging import TimedProgress diff --git a/archivebox/extractors/title.py b/archivebox/extractors/title.py index b54d5a04..6442b947 100644 --- a/archivebox/extractors/title.py +++ b/archivebox/extractors/title.py @@ -18,7 +18,7 @@ from ..config import ( CURL_VERSION, CURL_USER_AGENT, ) -from ..cli.logging import TimedProgress +from ..logging import TimedProgress HTML_TITLE_REGEX = re.compile( diff --git a/archivebox/extractors/wget.py b/archivebox/extractors/wget.py index d7133dcb..3221d8bd 100644 --- a/archivebox/extractors/wget.py +++ b/archivebox/extractors/wget.py @@ -31,7 +31,7 @@ from ..config import ( WGET_USER_AGENT, COOKIES_FILE, ) -from ..cli.logging import TimedProgress +from ..logging import TimedProgress @enforce_types diff --git a/archivebox/index/__init__.py b/archivebox/index/__init__.py index cd50a185..298f61a2 100644 --- a/archivebox/index/__init__.py +++ b/archivebox/index/__init__.py @@ -27,7 +27,7 @@ from ..config import ( ANSI, stderr, ) -from ..cli.logging import ( +from ..logging import ( TimedProgress, log_indexing_process_started, log_indexing_process_finished, diff --git a/archivebox/cli/logging.py b/archivebox/logging.py similarity index 98% rename from archivebox/cli/logging.py rename to archivebox/logging.py index f002e922..0bed5a30 100644 --- a/archivebox/cli/logging.py +++ b/archivebox/logging.py @@ -1,4 +1,4 @@ -__package__ = 'archivebox.cli' +__package__ = 'archivebox' import re import os @@ -13,11 +13,11 @@ from datetime import datetime from dataclasses import dataclass from typing import Optional, List, Dict, Union, IO -from ..index.schema import Link, ArchiveResult -from ..index.json import to_json -from ..index.csv import links_to_csv -from ..util import enforce_types -from ..config import ( +from .index.schema import Link, ArchiveResult +from .index.json import to_json +from .index.csv import links_to_csv +from .util import enforce_types +from .config import ( ConfigDict, PYTHON_ENCODING, ANSI, @@ -153,7 +153,7 @@ def progress_bar(seconds: int, prefix: str='') -> None: def log_cli_command(subcommand: str, subcommand_args: List[str], stdin: Optional[str], pwd: str): - from ..config import VERSION, ANSI + from .config import VERSION, ANSI cmd = ' '.join(('archivebox', subcommand, *subcommand_args)) stdin_hint = ' < /dev/stdin' if not stdin.isatty() else '' stderr('{black}[i] [{now}] ArchiveBox v{VERSION}: {cmd}{stdin_hint}{reset}'.format( diff --git a/archivebox/main.py b/archivebox/main.py index 999e4650..0345588f 100644 --- a/archivebox/main.py +++ b/archivebox/main.py @@ -88,7 +88,7 @@ from .config import ( USER_CONFIG, get_real_name, ) -from .cli.logging import ( +from .logging import ( TERM_WIDTH, TimedProgress, log_importing_started, diff --git a/archivebox/parsers/__init__.py b/archivebox/parsers/__init__.py index eabaece2..820fc9f9 100644 --- a/archivebox/parsers/__init__.py +++ b/archivebox/parsers/__init__.py @@ -29,7 +29,7 @@ from ..util import ( URL_REGEX, ) from ..index.schema import Link -from ..cli.logging import pretty_path, TimedProgress, log_source_saved +from ..logging import pretty_path, TimedProgress, log_source_saved from .pocket_html import parse_pocket_html_export from .pinboard_rss import parse_pinboard_rss_export from .shaarli_rss import parse_shaarli_rss_export