diff --git a/archivebox/core/settings.py b/archivebox/core/settings.py index 3c2c40f0..76bb134d 100644 --- a/archivebox/core/settings.py +++ b/archivebox/core/settings.py @@ -410,7 +410,7 @@ SHELL_PLUS_PRINT_SQL = False IPYTHON_ARGUMENTS = ['--no-confirm-exit', '--no-banner'] IPYTHON_KERNEL_DISPLAY_NAME = 'ArchiveBox Django Shell' if IS_SHELL: - os.environ['PYTHONSTARTUP'] = str(PACKAGE_DIR / 'core' / 'shell_welcome_message.py') + os.environ['PYTHONSTARTUP'] = str(PACKAGE_DIR / 'misc' / 'shell_welcome_message.py') ################################################################################ diff --git a/archivebox/core/urls.py b/archivebox/core/urls.py index e9eb4bca..6143e566 100644 --- a/archivebox/core/urls.py +++ b/archivebox/core/urls.py @@ -5,9 +5,10 @@ from django.views import static from django.conf import settings from django.views.generic.base import RedirectView -from .admin import archivebox_admin -from .views import HomepageView, SnapshotView, PublicIndexView, AddView, HealthCheckView -from .serve_static import serve_static +from archivebox.misc.serve_static import serve_static + +from core.admin_site import archivebox_admin +from core.views import HomepageView, SnapshotView, PublicIndexView, AddView, HealthCheckView # GLOBAL_CONTEXT doesn't work as-is, disabled for now: https://github.com/ArchiveBox/ArchiveBox/discussions/1306 # from archivebox.config import VERSION, VERSIONS_AVAILABLE, CAN_UPGRADE diff --git a/archivebox/core/views.py b/archivebox/core/views.py index 001449ac..68d9bbb6 100644 --- a/archivebox/core/views.py +++ b/archivebox/core/views.py @@ -30,8 +30,8 @@ from queues.tasks import bg_add from archivebox.config import CONSTANTS_CONFIG, DATA_DIR, VERSION from archivebox.config.common import SHELL_CONFIG, SERVER_CONFIG from archivebox.misc.util import base_url, htmlencode, ts_to_date_str +from archivebox.misc.serve_static import serve_static_with_byterange_support -from .serve_static import serve_static_with_byterange_support from ..plugins_extractor.archivedotorg.apps import ARCHIVEDOTORG_CONFIG from ..logging_util import printable_filesize from ..search import query_search_index diff --git a/archivebox/core/serve_static.py b/archivebox/misc/serve_static.py similarity index 100% rename from archivebox/core/serve_static.py rename to archivebox/misc/serve_static.py diff --git a/archivebox/core/shell_welcome_message.py b/archivebox/misc/shell_welcome_message.py similarity index 100% rename from archivebox/core/shell_welcome_message.py rename to archivebox/misc/shell_welcome_message.py