Refactor applications loading (wip).

modoboa/admin/apps.py

@@ -2,6 +2,8 @@
 
 from django.apps import AppConfig
 
+from .app_settings import load_admin_settings
+
 
 class AdminConfig(AppConfig):
 
@@ -11,4 +13,6 @@ class AdminConfig(AppConfig):
     verbose_name = "Modoboa admin console"
 
     def ready(self):
+        load_admin_settings()
+
         from . import handlers

modoboa/admin/callbacks.py

@@ -49,16 +49,6 @@ def extra_permissions(rolename):
     return PERMISSIONS.get(rolename, [])
 
 
-@events.observe("ExtraUprefsRoutes")
-def extra_routes():
-    from django.conf.urls import url
-    return [
-        url(r'^user/forward/',
-            'modoboa.admin.views.user.forward',
-            name="user_forward"),
-    ]
-
-
 @events.observe("AdminMenuDisplay")
 def admin_menu(target, user):
     if target != "top_menu":

modoboa/admin/management/commands/export_domains.py

@@ -4,7 +4,6 @@ from optparse import make_option
 
 from django.core.management.base import BaseCommand
 
-from modoboa.core import load_core_settings
 from modoboa.core.extensions import exts_pool
 from ...models import Domain
 
@@ -20,8 +19,6 @@ class Command(BaseCommand):
 
     def handle(self, *args, **kwargs):
         exts_pool.load_all()
-        load_core_settings()
-
         csvwriter = csv.writer(sys.stdout, delimiter=kwargs['sepchar'])
         for dom in Domain.objects.all():
             dom.to_csv(csvwriter)

modoboa/admin/management/commands/export_identities.py

@@ -4,7 +4,6 @@ from optparse import make_option
 
 from django.core.management.base import BaseCommand
 
-from modoboa.core import load_core_settings
 from modoboa.core.models import User
 from modoboa.core.extensions import exts_pool
 from ...models import Alias
@@ -21,11 +20,10 @@ class Command(BaseCommand):
 
     def handle(self, *args, **kwargs):
         exts_pool.load_all()
-        load_core_settings()
 
         csvwriter = csv.writer(sys.stdout, delimiter=kwargs['sepchar'])
         for u in User.objects.all():
             u.to_csv(csvwriter)
 
-        for a in Alias.objects.prefetch_related('mboxes', 'aliases'):
+        for a in Alias.objects.prefetch_related('aliasrecipient_set'):
             a.to_csv(csvwriter)

modoboa/admin/management/commands/import_domains.py

@@ -2,8 +2,6 @@ from optparse import make_option
 
 from django.core.management.base import BaseCommand
 
-
-from modoboa.core import load_core_settings
 from modoboa.core.extensions import exts_pool
 
 from ._import import import_csv
@@ -25,7 +23,5 @@ class Command(BaseCommand):
 
     def handle(self, *args, **kwargs):
         exts_pool.load_all()
-        load_core_settings()
-
         for filename in args:
             import_csv(filename, kwargs)

modoboa/admin/management/commands/import_identities.py

@@ -2,7 +2,6 @@ from optparse import make_option
 
 from django.core.management.base import BaseCommand
 
-from modoboa.core import load_core_settings
 from modoboa.core.extensions import exts_pool
 
 from ._import import import_csv
@@ -28,7 +27,5 @@ class Command(BaseCommand):
 
     def handle(self, *args, **kwargs):
         exts_pool.load_all()
-        load_core_settings()
-
         for filename in args:
             import_csv(filename, kwargs)

modoboa/admin/tests/password_schemes.py

@@ -1,6 +1,5 @@
 from django.core.urlresolvers import reverse
 
-from modoboa.core import load_core_settings
 from modoboa.core.models import User
 from modoboa.lib.tests import ModoTestCase
 from modoboa.lib import parameters
@@ -16,11 +15,6 @@ class PasswordSchemesTestCase(ModoTestCase):
         super(PasswordSchemesTestCase, cls).setUpTestData()
         factories.populate_database()
 
-    def setUp(self):
-        """Test initialization."""
-        super(PasswordSchemesTestCase, self).setUp()
-        load_core_settings()
-
     def _create_account(self):
         values = dict(
             username="tester@test.com", first_name="Tester", last_name="Toto",

modoboa/core/__init__.py

@@ -1,65 +1,15 @@
 
 from django.core.urlresolvers import reverse
-from django.utils.translation import ugettext as _, ugettext_lazy
+from django.utils.translation import ugettext as _
 
-from modoboa.lib import parameters, events
+from modoboa.lib import events
 
-BASE_EVENTS = [
-    "CanCreate",
-
-    "AccountCreated",
-    "AccountAutoCreated",
-    "AccountModified",
-    "AccountDeleted",
-    "AccountExported",
-    "AccountImported",
-    "PasswordUpdated",
-    "ExtraAccountActions",
-    "RoleChanged",
-    "GetExtraRoles",
-    "GetExtraRolePermissions",
-    "PasswordChange",
-    "UserCanSetRole",
-
-    "InitialDataLoaded",
-
-    "UserMenuDisplay",
-    "AdminMenuDisplay",
-    "GetStaticContent",
-
-    "UserLogin",
-    "UserLogout",
-
-    "GetAnnouncement",
-
-    "TopNotifications",
-    "ExtraAdminContent",
-
-    "ExtraUprefsRoutes",
-    "ExtraUprefsJS",
-
-    "GetExtraParameters",
-    "ExtraFormFields",
-    "SaveExtraFormFields",
-]
 
 PERMISSIONS = {
     "SimpleUsers": []
 }
 
 
-def load_core_settings():
-    """Load core settings.
-
-    This function must be manually called (see :file:`urls.py`) in
-    order to load base settings.
-    """
-    from modoboa.core.app_settings import GeneralParametersForm
-
-    parameters.register(GeneralParametersForm, ugettext_lazy("General"))
-    events.declare(BASE_EVENTS)
-
-
 @events.observe("TopNotifications")
 def check_for_new_version(request, include_all):
     """
@@ -78,3 +28,5 @@ def check_for_new_version(request, include_all):
         "text": _("One or more updates are available"),
         "level": "info",
     }]
+
+default_app_config = "modoboa.core.apps.CoreConfig"

modoboa/core/management/commands/cleanlogs.py

@@ -6,7 +6,6 @@ from optparse import make_option
 from django.core.management.base import BaseCommand
 from django.utils import timezone
 
-from modoboa.core import load_core_settings
 from modoboa.core.models import Log
 from modoboa.lib import parameters
 
@@ -39,7 +38,6 @@ class Command(BaseCommand):
             l.addHandler(logging.StreamHandler())
         self.verbose = options["verbose"]
 
-        load_core_settings()
         log_maximum_age = int(parameters.get_admin("LOG_MAXIMUM_AGE"))
         self.__vprint("Deleting logs older than %d days..." % log_maximum_age)
         limit = timezone.now() - datetime.timedelta(log_maximum_age)

modoboa/core/management/commands/load_initial_data.py

@@ -8,15 +8,13 @@
 from django.contrib.auth.models import Group
 from django.core.management.base import BaseCommand
 
-from modoboa.admin.app_settings import load_admin_settings
-from modoboa.core import load_core_settings, PERMISSIONS
+from modoboa.core import PERMISSIONS
 from modoboa.core.extensions import exts_pool
 from modoboa.core.models import User, ObjectAccess
 from modoboa.lib.cryptutils import random_key
 from modoboa.lib import events
 from modoboa.lib import models as lib_models
 from modoboa.lib.permissions import add_permissions_to_group
-from modoboa.limits.app_settings import load_limits_settings
 import modoboa.relaydomains.models as relay_models
 
 
@@ -28,10 +26,6 @@ class Command(BaseCommand):
 
     def handle(self, *args, **options):
         """Command entry point."""
-        load_core_settings()
-        load_admin_settings()
-        load_limits_settings()
-
         if not User.objects.filter(is_superuser=True).count():
             admin = User(username="admin", is_superuser=True)
             admin.set_password("password")

modoboa/core/models.py

@@ -135,7 +135,7 @@ class User(PermissionsMixin):
         try:
             scheme = parameters.get_admin("PASSWORD_SCHEME")
         except parameters.NotDefined:
-            from modoboa.core import load_core_settings
+            from modoboa.core.apps import load_core_settings
             load_core_settings()
             scheme = parameters.get_admin("PASSWORD_SCHEME")
 

modoboa/lib/parameters.py

@@ -16,6 +16,8 @@ from modoboa.lib import events
 from modoboa.lib.exceptions import ModoboaException
 from modoboa.lib.sysutils import guess_extension_name
 
+from . import db_utils
+
 
 _params = {'A': {}, 'U': {}}
 
@@ -91,6 +93,8 @@ class AdminParametersForm(GenericParametersForm):
     def _load_initial_values(self):
         from .models import Parameter
 
+        if not db_utils.db_table_exists("lib_parameter"):
+            return
         names = [
             "%s.%s" % (self.app, name.upper()) for name in self.fields.keys()
         ]
@@ -132,6 +136,8 @@ class UserParametersForm(GenericParametersForm):
         super(UserParametersForm, self).__init__(*args, **kwargs)
 
     def _load_initial_values(self):
+        if not db_utils.db_table_exists("lib_userparameter"):
+            return
         if self.user is None:
             return
         from .models import UserParameter

modoboa/limits/__init__.py

@@ -0,0 +1 @@
+default_app_config = "modoboa.limits.apps.LimitsConfig"

modoboa/limits/app_settings.py

@@ -3,14 +3,9 @@
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 
-from modoboa.lib import events, parameters
 from modoboa.lib.form_utils import SeparatorField
 from modoboa.lib.parameters import AdminParametersForm
 
-EVENTS = [
-    'GetExtraLimitTemplates'
-]
-
 
 class ParametersForm(AdminParametersForm):
     app = "limits"
@@ -73,11 +68,3 @@ class ParametersForm(AdminParametersForm):
     def __init__(self, *args, **kwargs):
         super(AdminParametersForm, self).__init__(*args, **kwargs)
         self._load_extra_parameters('A')
-
-
-def load_limits_settings():
-    """Load settings."""
-    parameters.register(ParametersForm, _("Limits"))
-    events.declare(EVENTS)
-    from . import controls
-    from . import general_callbacks

modoboa/relaydomains/app_settings.py

@@ -5,21 +5,10 @@ Relay domains settings definition.
 from django import forms
 from django.utils.translation import ugettext_lazy
 
-from modoboa.lib import events, parameters
+from modoboa.lib import parameters
 from modoboa.lib.form_utils import SeparatorField
 
 
-EVENTS = [
-    "RelayDomainCreated",
-    "RelayDomainDeleted",
-    "RelayDomainModified",
-    "RelayDomainAliasCreated",
-    "RelayDomainAliasDeleted",
-    "ExtraRelayDomainForm",
-    "FillRelayDomainInstances"
-]
-
-
 class AdminParametersForm(parameters.AdminParametersForm):
 
     """Admin parameters definition."""
@@ -34,12 +23,3 @@ class AdminParametersForm(parameters.AdminParametersForm):
         help_text=ugettext_lazy('Path to the master.cf configuration file'),
         widget=forms.TextInput(attrs={"class": "form-control"})
     )
-
-
-def load_relaydomains_settings():
-    """Load application settings."""
-    parameters.register(
-        AdminParametersForm, ugettext_lazy("Relay domains")
-    )
-    events.declare(EVENTS)
-    from . import general_callbacks

modoboa/relaydomains/apps.py

@@ -3,6 +3,28 @@
 from django.apps import AppConfig
 
 
+EVENTS = [
+    "RelayDomainCreated",
+    "RelayDomainDeleted",
+    "RelayDomainModified",
+    "RelayDomainAliasCreated",
+    "RelayDomainAliasDeleted",
+    "ExtraRelayDomainForm",
+    "FillRelayDomainInstances"
+]
+
+
+def load_relaydomains_settings():
+    """Load application settings."""
+    from django.utils.translation import ugettext as _
+    from modoboa.lib import events, parameters
+    from .app_settings import AdminParametersForm
+
+    parameters.register(AdminParametersForm, _("Relay domains"))
+    events.declare(EVENTS)
+    from . import general_callbacks
+
+
 class RelayDomainsConfig(AppConfig):
 
     """App configuration."""
@@ -11,4 +33,5 @@ class RelayDomainsConfig(AppConfig):
     verbose_name = "Modoboa relay domains"
 
     def ready(self):
+        load_relaydomains_settings()
         from . import handlers

modoboa/relaydomains/urls.py

@@ -3,6 +3,6 @@ from django.conf.urls import patterns, url
 urlpatterns = patterns(
     'modoboa.relaydomains.views',
 
-    url(r'^relaydomains/scan_services/$', 'scan_for_services',
+    url(r'^scan_services/$', 'scan_for_services',
         name="service_scan"),
 )

modoboa/urls.py

@@ -1,27 +1,21 @@
 from django.conf import settings
 from django.conf.urls import patterns, include, url
 
-from modoboa.admin.app_settings import load_admin_settings
-from modoboa.core import load_core_settings
 from modoboa.core.extensions import exts_pool
 from modoboa.lib import parameters, events
-from modoboa.limits.app_settings import load_limits_settings
-from modoboa.relaydomains.app_settings import load_relaydomains_settings
 
 
-load_core_settings()
-load_admin_settings()
-load_limits_settings()
-load_relaydomains_settings()
-
 urlpatterns = patterns(
     '',
     url(r'^$', 'modoboa.lib.web_utils.topredirection', name="topredirection"),
     (r'^jsi18n/$', 'django.views.i18n.javascript_catalog',
      {'packages': ('modoboa', ), }),
     ('', include('modoboa.core.urls', namespace="core")),
-    ('', include('modoboa.admin.urls', namespace="admin")),
-    ('', include('modoboa.relaydomains.urls', namespace="relaydomains")),
+    url('^user/forward/', 'modoboa.admin.views.user.forward',
+        name='user_forward'),
+    ('admin/', include('modoboa.admin.urls', namespace="admin")),
+    ('relaydomains/',
+     include('modoboa.relaydomains.urls', namespace="relaydomains")),
 )
 
 urlpatterns += patterns(