Automatically register all provider classes.

diff --git a/src/ddns/__init__.py b/src/ddns/__init__.py
index d14097dbcb9cf97be66162352765cf73061ab1b6..78009e33e98cf1a30531e4fc1ff15074007e37ef 100644 (file)
--- a/src/ddns/__init__.py
+++ b/src/ddns/__init__.py
@@ -28,7 +28,8 @@ from i18n import _
 logger = logging.getLogger("ddns.core")
 logger.propagate = 1
 
 logger = logging.getLogger("ddns.core")
 logger.propagate = 1
 

-from .providers import *
+import providers
+

 from .system import DDNSSystem
 
 # Setup the logger.
 from .system import DDNSSystem
 
 # Setup the logger.


@@ -61,8 +62,10 @@ class DDNSCore(object):
                self.settings = {}
 
                # Dict with all providers, that are supported.
                self.settings = {}
 
                # Dict with all providers, that are supported.

-               self.providers = {}
-               self.register_all_providers()
+               self.providers = providers.get()
+
+               for handle, provider in sorted(self.providers.items()):
+                       logger.debug("Registered new provider: %s (%s)" % (provider.name, provider.handle))

 
                # List of configuration entries.
                self.entries = []
 
                # List of configuration entries.
                self.entries = []


@@ -70,49 +73,6 @@ class DDNSCore(object):
                # Add the system class.
                self.system = DDNSSystem(self)
 
                # Add the system class.
                self.system = DDNSSystem(self)
 

-       def register_provider(self, provider):
-               """
-                       Registers a new provider.
-               """
-               assert issubclass(provider, DDNSProvider)
-
-               if not all((provider.handle, provider.name, provider.website)):
-                       raise DDNSError(_("Provider is not properly configured"))
-
-               assert not self.providers.has_key(provider.handle), \
-                       "Provider '%s' has already been registered" % provider.handle
-
-               logger.debug("Registered new provider: %s (%s)" % (provider.name, provider.handle))
-               self.providers[provider.handle] = provider
-
-       def register_all_providers(self):
-               """
-                       Simply registers all providers.
-               """
-               for provider in (
-                       DDNSProviderAllInkl,
-                       DDNSProviderDHS,
-                       DDNSProviderDNSpark,
-                       DDNSProviderDtDNS,
-                       DDNSProviderDynDNS,
-                       DDNSProviderDynU,
-                       DDNSProviderEasyDNS,
-                       DDNSProviderFreeDNSAfraidOrg,
-                       DDNSProviderNamecheap,
-                       DDNSProviderNOIP,
-                       DDNSProviderLightningWireLabs,
-                       DDNSProviderOVH,
-                       DDNSProviderRegfish,
-                       DDNSProviderSelfhost,
-                       DDNSProviderSPDNS,
-                       DDNSProviderStrato,
-                       DDNSProviderTwoDNS,
-                       DDNSProviderUdmedia,
-                       DDNSProviderVariomedia,
-                       DDNSProviderZoneedit,
-               ):
-                       self.register_provider(provider)
-

        def get_provider_names(self):
                """
                        Returns a list of names of all registered providers.
        def get_provider_names(self):
                """
                        Returns a list of names of all registered providers.

diff --git a/src/ddns/providers.py b/src/ddns/providers.py
index 91e02272da07d5ad0bb690c232f4689894a2b4d8..ed893a4d2e29ed67bb88237ed0101c2846b22d42 100644 (file)
--- a/src/ddns/providers.py
+++ b/src/ddns/providers.py
@@ -31,6 +31,14 @@ from .errors import *
 logger = logging.getLogger("ddns.providers")
 logger.propagate = 1
 
 logger = logging.getLogger("ddns.providers")
 logger.propagate = 1
 

+_providers = {}
+
+def get():
+       """
+               Returns a dict with all automatically registered providers.
+       """
+       return _providers.copy()
+

 class DDNSProvider(object):
        # A short string that uniquely identifies
        # this provider.
 class DDNSProvider(object):
        # A short string that uniquely identifies
        # this provider.


@@ -48,6 +56,24 @@ class DDNSProvider(object):
 
        DEFAULT_SETTINGS = {}
 
 
        DEFAULT_SETTINGS = {}
 

+       # Automatically register all providers.
+       class __metaclass__(type):
+               def __init__(provider, name, bases, dict):
+                       type.__init__(provider, name, bases, dict)
+
+                       # The main class from which is inherited is not registered
+                       # as a provider.
+                       if name == "DDNSProvider":
+                               return
+
+                       if not all((provider.handle, provider.name, provider.website)):
+                               raise DDNSError(_("Provider is not properly configured"))
+
+                       assert not _providers.has_key(provider.handle), \
+                               "Provider '%s' has already been registered" % provider.handle
+
+                       _providers[provider.handle] = provider
+

        def __init__(self, core, **settings):
                self.core = core
 
        def __init__(self, core, **settings):
                self.core = core