Changeset 99

Timestamp:

06/27/07 21:22:36 (2 years ago)

Author:

David Rousselie <dax@happycoders.org>

Message:

some module refactoring

Files:

• src/jmc/jabber/__init__.py (modified) (1 diff)
• src/jmc/jabber/component.py (modified) (2 diffs)
• src/jmc/jabber/message.py (added)
• src/jmc/jabber/presence.py (added)
• src/jmc/jabber/tests/component.py (modified) (1 diff)
• src/jmc/model/account.py (modified) (1 diff)

src/jmc/jabber/__init__.py

@@ -1 +1 @@
-"""Jabber component classes"""
-__revision__ = ""
+
+import re
+
+from jcl.jabber import Handler
+from jcl.model.account import Account
+
+from jmc.model.account import NoAccountError, SMTPAccount
+
+class MailHandler(Handler):
+    """Define filter for email address in JID"""
+
+    def __init__(self):
+        Handler.__init__(self)
+        self.dest_jid_regexp = re.compile(".*%.*")
+
+    def filter(self, stanza, lang_class):
+        """Return empty array if JID match '.*%.*@componentJID'"""
+        node = stanza.get_to().node
+        if node is not None and self.dest_jid_regexp.match(node):
+            bare_from_jid = unicode(stanza.get_from().bare())
+            accounts = Account.select(Account.q.user_jid == bare_from_jid)
+            if accounts.count() == 0:
+                raise NoAccountError()
+            else:
+                default_account = accounts.newClause(\
+                    SMTPAccount.q.default_account == True)
+                if default_account.count() > 0:
+                    return default_account
+                else:
+                    return accounts
+        return None

src/jmc/jabber/component.py

@@ -32 +32 @@
-
-from jcl.model.account import Account, PresenceAccount, LegacyJID
-
-
+
-from jcl.jabber.feeder import FeederComponent, Feeder, MessageSender, \
-    HeadlineSender, FeederHandler
-
+from jmc.jabber.message import SendMailMessageHandler, \
+     RootSendMailMessageHandler
+from jmc.jabber.presence import MailSubscribeHandler, \
+     MailUnsubscribeHandler, MailPresenceHandler
-from jmc.model.account import MailAccount, IMAPAccount, POP3Account, \
-    SMTPAccount
-from jmc.lang import Lang
-
-class NoAccountError(Exception):
-    """Error raised when no corresponding account is found."""
-    pass
-
-class MailComponent(FeederComponent):
@@ -225 +224 @@
-        return message
-
-class MailHandler(Handler):
-    """Define filter for email address in JID"""
-
-    def __init__(self):
-        Handler.__init__(self)
-        self.dest_jid_regexp = re.compile(".*%.*")
-
-    def filter(self, stanza, lang_class):
-        """Return empty array if JID match '.*%.*@componentJID'"""
-        node = stanza.get_to().node
-        if node is not None and self.dest_jid_regexp.match(node):
-            bare_from_jid = unicode(stanza.get_from().bare())
-            accounts = Account.select(Account.q.user_jid == bare_from_jid)
-            if accounts.count() == 0:
-                raise NoAccountError()
-            else:
-                default_account = accounts.newClause(\
-                    SMTPAccount.q.default_account == True)
-                if default_account.count() > 0:
-                    return default_account
-                else:
-                    return accounts
-        return None
-
-class MailPresenceHandler(DefaultPresenceHandler):
-    """Define filter for legacy JIDs presence handling"""
-    def __init__(self):
-        Handler.__init__(self)
-        self.dest_jid_regexp = re.compile(".*%.*")
-
-    def filter(self, stanza, lang_class):
-        """Return empty array if JID match '.*%.*@componentJID'"""
-        node = stanza.get_to().node
-        if node is not None and self.dest_jid_regexp.match(node):
-            bare_from_jid = unicode(stanza.get_from().bare())
-            return [] # Not None
-        return None
-
-class SendMailMessageHandler(MailHandler):
-    def __init__(self):
-        MailHandler.__init__(self)
-        self.__logger = logging.getLogger(\
-            "jmc.jabber.component.SendMailMessageHandler")
-
-    def send_mail_result(self, message, lang_class, to_email):
-        return [Message(from_jid=message.get_to(),
-                        to_jid=message.get_from(),
-                        subject=lang_class.send_mail_ok_subject,
-                        body=lang_class.send_mail_ok_body % (to_email))]
-
-    def handle(self, message, lang_class, accounts):
-        to_node = message.get_to().node
-        to_email = to_node.replace('%', '@', 1)
-        accounts[0].send_email(\
-            accounts[0].create_email(accounts[0].default_from,
-                                     to_email,
-                                     message.get_subject(),
-                                     message.get_body()))
-        return self.send_mail_result(message, lang_class, to_email)
-
-class RootSendMailMessageHandler(SendMailMessageHandler):
-    """Handle message sent to root JID"""
-
-    def __init__(self):
-        SendMailMessageHandler.__init__(self)
-        self.to_regexp = re.compile("^\s*(to|TO|To)\s*:\s*(?P<to_email>.*)")
-        self.__logger = logging.getLogger(\
-            "jmc.jabber.component.RootSendMailMessageHandler")
-
-    def filter(self, message, lang_class):
-        name = message.get_to().node
-        bare_from_jid = unicode(message.get_from().bare())
-        accounts = SMTPAccount.select(\
-            AND(SMTPAccount.q.default_account == True,
-                SMTPAccount.q.user_jid == bare_from_jid))
-        if accounts.count() != 1:
-            self.__logger.error("No default account found for user " +
-                                str(bare_from_jid))
-        if accounts.count() == 0:
-            accounts = SMTPAccount.select(\
-                SMTPAccount.q.user_jid == bare_from_jid)
-        return accounts
-
-    def handle(self, message, lang_class, accounts):
-        to_email = None
-        lines = message.get_body().split('\n')
-        message_body = []
-        while to_email is None \
-                and lines:
-            line = lines.pop(0)
-            match = self.to_regexp.match(line)
-            if match:
-                to_email = match.group("to_email")
-            else:
-                message_body.append(line)
-        message_body.extend(lines)
-        if to_email is not None:
-            accounts[0].send_email(\
-                accounts[0].create_email(accounts[0].default_from,
-                                         to_email,
-                                         message.get_subject(),
-                                         "\n".join(message_body)))
-            return self.send_mail_result(message, lang_class, to_email)
-        else:
-            return [Message(from_jid=message.get_to(),
-                            to_jid=message.get_from(),
-                            stanza_type="error",
-                            subject=lang_class.send_mail_error_no_to_header_subject,
-                            body=lang_class.send_mail_error_no_to_header_body)]
-
-class MailSubscribeHandler(DefaultSubscribeHandler, MailHandler):
-    """Use DefaultSubscribeHandler handle method and MailHandler filter.
-    Filter email address in JID. Accept and add to LegacyJID table.
-    """
-
-    def __init__(self):
-        DefaultSubscribeHandler.__init__(self)
-        MailHandler.__init__(self)
-
-    def filter(self, stanza, lang_class):
-        return MailHandler.filter(self, stanza, lang_class)
-
-    def handle(self, stanza, lang_class, accounts):
-        result = DefaultSubscribeHandler.handle(self, stanza, lang_class, accounts)
-        to_node = stanza.get_to().node
-        to_email = to_node.replace('%', '@', 1)
-        LegacyJID(legacy_address=to_email,
-                  jid=unicode(stanza.get_to()),
-                  account=accounts[0])
-        return result
-
-class MailUnsubscribeHandler(DefaultUnsubscribeHandler, MailHandler):
-    """Use DefaultUnsubscribeHandler handle method and MailHandler filter.
-    """
-
-    def __init__(self):
-        DefaultUnsubscribeHandler.__init__(self)
-        MailHandler.__init__(self)
-
-    def filter(self, stanza, lang_class):
-        return MailHandler.filter(self, stanza, lang_class)
-
-    def handle(self, stanza, lang_class, accounts):
-        result = DefaultUnsubscribeHandler.handle(self, stanza, lang_class, accounts)
-        legacy_jid = LegacyJID.select(\
-           LegacyJID.q.jid == unicode(stanza.get_to()))
-        if legacy_jid.count() == 1:
-            legacy_jid[0].destroySelf()
-        return result
-
-class MailFeederHandler(FeederHandler):
-    def filter(self, stanza, lang_class):

src/jmc/jabber/tests/component.py

@@ -39 +39 @@
-
-from jmc.model.account import MailAccount, IMAPAccount, POP3Account, \
-
-
-
-
-
+
+
+
+
+
+
+
+
-from jmc.lang import Lang
-

src/jmc/model/account.py

@@ -45 +45 @@
-IMAP4_TIMEOUT = 10
-POP3_TIMEOUT = 10
+
+class NoAccountError(Exception):
+    """Error raised when no corresponding account is found."""
+    pass
-
-## All MY* classes are implemented to add a timeout (settimeout)