Changeset 65

Timestamp:

11/07/07 01:14:41 (1 year ago)

Author:

amcgregor

Message:

Modified extension loading behaviour.

Location:

branches/3.0/turbomail

Files:

• control.py (modified) (5 diffs)
• extensions/utf8qp.py (modified) (3 diffs)

branches/3.0/turbomail/control.py

@@ -20 +20 @@
 """
 
+__version__ = "$Revision: 1 $"
+
 import logging
 log = logging.getLogger("turbomail.control")
@@ -37 +39 @@
         def __init__(self):
                 self.running = False
+                self.extensions = dict()
                 
                 try:
@@ -43 +46 @@
                         turbomail.config = dict()
                 else:
+                        if not hasattr(turbomail, 'config'):
+                                turbomail.config = dict()
+                                return
+                        
+                        turbogears.config.update(turbomail.config)
                         turbomail.config = turbogears.config
                         self.start_extension = self.start
@@ -65 +73 @@
                 log.info("TurboMail extension starting up.")
                 
-                # Load the requested pool manager.
-                manager = turbomail.config.get("mail.manager", "immediate")
-                controller = self.load_single_entry("turbomail.managers", manager)
-                if not controller:
-                        turbomail.config.update({"mail.on": False})
-                        log.error("Unable to locate %s manager, TurboMail disabled." % manager)
-                        self.stop(force=True)
-                        return
-                turbomail.manager = controller.load()
-                turbomail.manager.start()
+                def load(t, default):
+                        extension = turbomail.config.get("mail.%s" % t, default)
+                        controller = self.load_single_entry("turbomail.%ss" % t, extension)
+                        if not controller:
+                                turbomail.config.update({"mail.on": False})
+                                log.error("Unable to locate %s %s, TurboMail disabled." % (extension, t))
+                                self.stop(force=True)
+                                return
+                        setattr(turbomail, t, controller.load())
+                        controller.start()
                 
-                # Load the requested mail provider.
-                provider = turbomail.config.get("mail.provider", "debug")
-                controller = self.load_single_entry("turbomail.providers", provider)
-                if not controller:
-                        turbomail.config.update({"mail.on": False})
-                        log.error("Unable to locate %s provider, TurboMail disabled." % provider)
-                        self.stop(force=True)
-                        return
-                turbomail.provider = controller.load()
-                turbomail.provider.start()
+                # Load the requested manager and provider.
+                load('manager', 'immediate')
+                load('provider', 'debug')
                 
                 # Load and initalize the various extensions.
@@ -91 +92 @@
                 for entrypoint in extensions:
                         log.debug("Found extension '%s'." % entrypoint.name)
-                        if turbomail.config.get("mail." + entrypoint.name + ".on", False):
-                                log.debug("Loading extension '%s'." % entrypoint.name)
-                                ext = entrypoint.load()
-                                if hasattr(ext, "start"): ext.start()
+                        if turbomail.config.get("mail.%s.on" % entrypoint.name, False):
+                                log.info("Loading extension '%s'." % entrypoint.name)
+                                self.extensions[entrypoint.name] = entrypoint.load()
+                                
+                                if hasattr(self.extensions[entrypoint.name], 'load'):
+                                        self.extensions[entrypoint.name] = self.extensions[entrypoint.name].load()
+                                
+                                if hasattr(self.extensions[entrypoint.name], 'start'):
+                                        self.extensions[entrypoint.name].start()
                 
                 self.running = True

branches/3.0/turbomail/extensions/utf8qp.py

@@ -2 +2 @@
 
 """TurboMail extension API."""
+
+__version__ = "$Revision: 1 $"
 
 import logging
@@ -7 +9 @@
 
 import turbomail
+from turbomail.api import Extension
 
 from email import Charset
@@ -13 +16 @@
 
 
-def start():
-        log.info("Configuring UTF-8 character set to use Quoted-Printable encoding.")
-        Charset.add_charset('utf-8', Charset.SHORTEST, Charset.QP, 'utf-8')
-        turbomail.config.update({"mail.encoding": "utf-8"})
+class UTF8QuotedPrintable(Extension):
+        name = "utf8qp"
+        version = "1.0"
+        url = "http://www.python-turbomail.org/wiki/3.0/SampleExtension"
+        
+        def start(self):
+                super(UTF8QuotedPrintable, self).start()
+                
+                log.info("Configuring UTF-8 character set to use Quoted-Printable encoding.")
+                Charset.add_charset('utf-8', Charset.SHORTEST, Charset.QP, 'utf-8')
+                turbomail.config.update({"mail.encoding": "utf-8"})
+        
+        def stop(self):
+                super(UTF8QuotedPrintable, self).stop()
+                
+                log.info("Configuring UTF-8 character set to use Base-64 encoding.")
+                Charset.add_charset('utf-8', Charset.SHORTEST, Charset.BASE64, 'utf-8')
+
+
+def load():
+        return UTF8QuotedPrintable()
+
+