Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

move reloading back to registry

Browse Source
This commit is contained in:
Matthias Mair 2023-02-13 22:55:59 +01:00
parent 0016dc991f
commit b944f6bc06
No known key found for this signature in database
GPG Key ID: A593429DDA23B66A
2 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
InvenTree/plugin/base/integration/AppMixin.py
View File

@ -1,14 +1,11 @@
"""Plugin mixin class for AppMixin."""
import logging
from importlib import reload
from typing import OrderedDict
from django.apps import apps
from django.conf import settings
from django.contrib import admin
from plugin.helpers import handle_error
logger = logging.getLogger('inventree')
@ -54,12 +51,12 @@ class AppMixin:
# first startup or force loading of base apps -> registry is prob false
if registry.apps_loading or force_reload:
registry.apps_loading = False
cls._reload_apps(force_reload=True, full_reload=full_reload)
registry._reload_apps(force_reload=True, full_reload=full_reload)
else:
cls._reload_apps(full_reload=full_reload)
registry._reload_apps(full_reload=full_reload)
# rediscover models/ admin sites
cls._reregister_contrib_apps()
cls._reregister_contrib_apps(cls, registry)
# update urls - must be last as models must be registered for creating admin routes
registry._update_urls()
@ -109,14 +106,13 @@ class AppMixin:
registry._update_urls()
# region helpers
@classmethod
def _reregister_contrib_apps(cls):
def _reregister_contrib_apps(self, registry):
"""Fix reloading of contrib apps - models and admin.
This is needed if plugins were loaded earlier and then reloaded as models and admins rely on imports.
Those register models and admin in their respective objects (e.g. admin.site for admin).
"""
for plugin_path in cls.installed_apps:
for plugin_path in registry.installed_apps:
try:
app_name = plugin_path.split('.')[-1]
app_config = apps.get_app_config(app_name)
@ -159,39 +155,7 @@ class AppMixin:
plugin_path = plugin.__module__.split('.')[0]
return plugin_path
@classmethod
def _try_reload(cls, cmd, *args, **kwargs):
"""Wrapper to try reloading the apps.
Throws an custom error that gets handled by the loading function.
"""
try:
cmd(*args, **kwargs)
return True, []
except Exception as error: # pragma: no cover
handle_error(error)
@classmethod
def _reload_apps(cls, force_reload: bool = False, full_reload: bool = False):
"""Internal: reload apps using django internal functions.
Args:
force_reload (bool, optional): Also reload base apps. Defaults to False.
full_reload (bool, optional): Reload everything - including plugin mechanism. Defaults to False.
"""
# If full_reloading is set to true we do not want to set the flag
if not full_reload:
cls.is_loading = True # set flag to disable loop reloading
if force_reload:
# we can not use the built in functions as we need to brute force the registry
apps.app_configs = OrderedDict()
apps.apps_ready = apps.models_ready = apps.loading = apps.ready = False
apps.clear_cache()
cls._try_reload(apps.populate, settings.INSTALLED_APPS)
else:
cls._try_reload(apps.set_installed_apps, settings.INSTALLED_APPS)
cls.is_loading = False
# endregion
# endregion
@property
def has_app(self):

38
InvenTree/plugin/registry.py
View File

@ -10,8 +10,9 @@ import logging
import os
import subprocess
from pathlib import Path
from typing import Dict, List
from typing import Dict, List, OrderedDict
from django.apps import apps
from django.conf import settings
from django.contrib import admin
from django.db.utils import IntegrityError, OperationalError, ProgrammingError
@ -473,15 +474,50 @@ class PluginsRegistry:
if hasattr(mixin, '_activate_mixin'):
mixin._activate_mixin(self, plugins, force_reload=force_reload, full_reload=full_reload)
logger.info('Done activating')
def _deactivate_plugins(self):
"""Run deactivation functions for all plugins."""
for mixin in self.mixin_order:
if hasattr(mixin, '_deactivate_mixin'):
mixin._deactivate_mixin(self)
logger.info('Done deactivating')
# endregion
# region mixin specific loading ...
def _try_reload(self, cmd, *args, **kwargs):
"""Wrapper to try reloading the apps.
Throws an custom error that gets handled by the loading function.
"""
try:
cmd(*args, **kwargs)
return True, []
except Exception as error: # pragma: no cover
handle_error(error)
def _reload_apps(self, force_reload: bool = False, full_reload: bool = False):
"""Internal: reload apps using django internal functions.
Args:
force_reload (bool, optional): Also reload base apps. Defaults to False.
full_reload (bool, optional): Reload everything - including plugin mechanism. Defaults to False.
"""
# If full_reloading is set to true we do not want to set the flag
if not full_reload:
self.is_loading = True # set flag to disable loop reloading
if force_reload:
# we can not use the built in functions as we need to brute force the registry
apps.app_configs = OrderedDict()
apps.apps_ready = apps.models_ready = apps.loading = apps.ready = False
apps.clear_cache()
self._try_reload(apps.populate, settings.INSTALLED_APPS)
else:
self._try_reload(apps.set_installed_apps, settings.INSTALLED_APPS)
self.is_loading = False
def _clean_installed_apps(self):
for plugin in self.installed_apps:
if plugin in settings.INSTALLED_APPS: