diff --git a/archivebox/plugantic/base_plugin.py b/archivebox/plugantic/base_plugin.py index 2bad938d..a890f961 100644 --- a/archivebox/plugantic/base_plugin.py +++ b/archivebox/plugantic/base_plugin.py @@ -84,7 +84,7 @@ class BasePlugin(BaseModel): # preserve references to original default objects, # pydantic deepcopies them by default which breaks mutability # see https://github.com/pydantic/pydantic/issues/7608 - # if we dont do this, then plugins_sys.base.CORE_CONFIG != settings.CONFIGS.CoreConfig for example + # if we dont do this, then plugins_extractor.SINGLEFILE_CONFIG != settings.CONFIGS.SingleFileConfig for example # and calling .__init__() on one of them will not update the other self.hooks = self.model_fields['hooks'].default diff --git a/archivebox/plugins_extractor/singlefile/apps.py b/archivebox/plugins_extractor/singlefile/apps.py index d8526e9a..e2b610f3 100644 --- a/archivebox/plugins_extractor/singlefile/apps.py +++ b/archivebox/plugins_extractor/singlefile/apps.py @@ -19,7 +19,7 @@ from plugantic.base_queue import BaseQueue from plugantic.base_hook import BaseHook # Depends on Other Plugins: -from plugins_sys.base.apps import ARCHIVING_CONFIG +from plugins_sys.config.apps import ARCHIVING_CONFIG from plugins_pkg.npm.apps import SYS_NPM_BINPROVIDER, LIB_NPM_BINPROVIDER ###################### Config ########################## diff --git a/archivebox/plugins_sys/base/__init__.py b/archivebox/plugins_sys/config/__init__.py similarity index 100% rename from archivebox/plugins_sys/base/__init__.py rename to archivebox/plugins_sys/config/__init__.py diff --git a/archivebox/plugins_sys/base/apps.py b/archivebox/plugins_sys/config/apps.py similarity index 97% rename from archivebox/plugins_sys/base/apps.py rename to archivebox/plugins_sys/config/apps.py index 3929b40f..f8a7903d 100644 --- a/archivebox/plugins_sys/base/apps.py +++ b/archivebox/plugins_sys/config/apps.py @@ -123,9 +123,9 @@ class SearchBackendConfig(BaseConfigSet): SEARCH_BACKEND_CONFIG = SearchBackendConfig() -class CorePlugin(BasePlugin): - app_label: str = 'core' - verbose_name: str = 'Core' +class ConfigPlugin(BasePlugin): + app_label: str = 'config' + verbose_name: str = 'Configuration' hooks: List[InstanceOf[BaseHook]] = [ SHELL_CONFIG, @@ -137,6 +137,6 @@ class CorePlugin(BasePlugin): ] -PLUGIN = CorePlugin() +PLUGIN = ConfigPlugin() PLUGIN.register(settings) DJANGO_APP = PLUGIN.AppConfig