move config into dedicated global app

archivebox/cli/__init__.py

@@ -4,7 +4,6 @@ __command__ = 'archivebox'
 import sys
 import argparse
 import threading
-import archivebox
 
 from time import sleep
 from collections.abc import Mapping
@@ -12,6 +11,7 @@ from collections.abc import Mapping
 from typing import Optional, List, IO, Union, Iterable
 from pathlib import Path
 
+from archivebox.config import DATA_DIR
 from ..misc.checks import check_data_folder, check_migrations
 from ..misc.logging import stderr
 
@@ -149,7 +149,7 @@ def run_subcommand(subcommand: str,
     subcommand_args = subcommand_args or []
 
     if subcommand not in meta_cmds:
-        from ..config import setup_django, CONFIG
+        from ..config.legacy import setup_django, CONFIG
 
         cmd_requires_db = subcommand in archive_cmds
         init_pending = '--init' in subcommand_args or '--quick-init' in subcommand_args
@@ -234,12 +234,12 @@ def main(args: List[str] | Omitted=OMITTED, stdin: IO | Omitted=OMITTED, pwd: st
             subcommand=command.subcommand,
             subcommand_args=command.subcommand_args,
             stdin=stdin or None,
-            pwd=pwd or archivebox.DATA_DIR,
+            pwd=pwd or DATA_DIR,
         )
 
     run_subcommand(
         subcommand=command.subcommand,
         subcommand_args=command.subcommand_args,
         stdin=stdin or None,
-        pwd=pwd or archivebox.DATA_DIR,
+        pwd=pwd or DATA_DIR,
     )

archivebox/cli/archivebox_add.py

@@ -11,7 +11,7 @@ from typing import List, Optional, IO
 from ..main import add
 from ..util import docstring
 from ..parsers import PARSERS
-from ..config import OUTPUT_DIR, ONLY_NEW
+from ..config.legacy import OUTPUT_DIR, ONLY_NEW
 from ..logging_util import SmartFormatter, accept_stdin, stderr
 
 

archivebox/cli/archivebox_config.py

@@ -10,7 +10,7 @@ from typing import Optional, List, IO
 
 from ..main import config
 from ..util import docstring
-from ..config import OUTPUT_DIR
+from ..config.legacy import OUTPUT_DIR
 from ..logging_util import SmartFormatter, accept_stdin
 
 

archivebox/cli/archivebox_help.py

@@ -10,7 +10,7 @@ from typing import Optional, List, IO
 
 from ..main import help
 from ..util import docstring
-from ..config import OUTPUT_DIR
+from ..config.legacy import OUTPUT_DIR
 from ..logging_util import SmartFormatter, reject_stdin
 
 

archivebox/cli/archivebox_init.py

@@ -10,7 +10,7 @@ from typing import Optional, List, IO
 
 from ..main import init
 from ..util import docstring
-from ..config import OUTPUT_DIR
+from ..config.legacy import OUTPUT_DIR
 from ..logging_util import SmartFormatter, reject_stdin
 
 

archivebox/cli/archivebox_list.py

@@ -10,7 +10,7 @@ from typing import Optional, List, IO
 
 from ..main import list_all
 from ..util import docstring
-from ..config import OUTPUT_DIR
+from ..config.legacy import OUTPUT_DIR
 from ..index import (
     LINK_FILTERS,
     get_indexed_folders,

archivebox/cli/archivebox_manage.py

@@ -9,7 +9,7 @@ from typing import Optional, List, IO
 
 from ..main import manage
 from ..util import docstring
-from ..config import OUTPUT_DIR
+from ..config.legacy import OUTPUT_DIR
 
 
 @docstring(manage.__doc__)

archivebox/cli/archivebox_oneshot.py

@@ -11,7 +11,7 @@ from typing import List, Optional, IO
 
 from ..main import oneshot
 from ..util import docstring
-from ..config import OUTPUT_DIR
+from ..config.legacy import OUTPUT_DIR
 from ..logging_util import SmartFormatter, accept_stdin, stderr
 
 

archivebox/cli/archivebox_remove.py

@@ -10,7 +10,7 @@ from typing import Optional, List, IO
 
 from ..main import remove
 from ..util import docstring
-from ..config import OUTPUT_DIR
+from ..config.legacy import OUTPUT_DIR
 from ..logging_util import SmartFormatter, accept_stdin
 
 

archivebox/cli/archivebox_schedule.py

@@ -10,7 +10,7 @@ from typing import Optional, List, IO
 
 from ..main import schedule
 from ..util import docstring
-from ..config import OUTPUT_DIR
+from ..config.legacy import OUTPUT_DIR
 from ..logging_util import SmartFormatter, reject_stdin
 
 

archivebox/cli/archivebox_server.py

@@ -10,7 +10,7 @@ from typing import Optional, List, IO
 
 from ..main import server
 from ..util import docstring
-from ..config import OUTPUT_DIR, BIND_ADDR
+from ..config.legacy import OUTPUT_DIR, BIND_ADDR
 from ..logging_util import SmartFormatter, reject_stdin
 
 @docstring(server.__doc__)

archivebox/cli/archivebox_setup.py

@@ -10,7 +10,7 @@ from typing import Optional, List, IO
 
 from ..main import setup
 from ..util import docstring
-from ..config import OUTPUT_DIR
+from ..config.legacy import OUTPUT_DIR
 from ..logging_util import SmartFormatter, reject_stdin
 
 

archivebox/cli/archivebox_shell.py

@@ -10,7 +10,7 @@ from typing import Optional, List, IO
 
 from ..main import shell
 from ..util import docstring
-from ..config import OUTPUT_DIR
+from ..config.legacy import OUTPUT_DIR
 from ..logging_util import SmartFormatter, reject_stdin
 
 

archivebox/cli/archivebox_status.py

@@ -10,7 +10,7 @@ from typing import Optional, List, IO
 
 from ..main import status
 from ..util import docstring
-from ..config import OUTPUT_DIR
+from ..config.legacy import OUTPUT_DIR
 from ..logging_util import SmartFormatter, reject_stdin
 
 

archivebox/cli/archivebox_update.py

@@ -10,7 +10,7 @@ from typing import List, Optional, IO
 
 from ..main import update
 from ..util import docstring
-from ..config import OUTPUT_DIR
+from ..config.legacy import OUTPUT_DIR
 from ..index import (
     LINK_FILTERS,
     get_indexed_folders,

archivebox/cli/archivebox_version.py

@@ -10,7 +10,7 @@ from typing import Optional, List, IO
 
 from ..main import version
 from ..util import docstring
-from ..config import OUTPUT_DIR
+from ..config.legacy import OUTPUT_DIR
 from ..logging_util import SmartFormatter, reject_stdin
 
 

archivebox/cli/tests.py

@@ -32,7 +32,7 @@ os.environ.update(TEST_CONFIG)
 
 from ..main import init
 from ..index import load_main_index
-from ..config import (
+from ..config.legacy import (
     SQL_INDEX_FILENAME,
     JSON_INDEX_FILENAME,
     HTML_INDEX_FILENAME,