Changeset 41

Timestamp:

01/25/06 15:20:10 (17 years ago)

Author:

bas

Message:

EmailtoTracScript?:

email2trac.py.in:

• Added TicketNotify? function (Kilian Cavalotti)
• Unified importing of python trac modules
• Revert changes to Spam control. It works as it used to be.

File:

• emailtotracscript/trunk/email2trac.py.in (modified) (8 diffs)

emailtotracscript/trunk/email2trac.py.in

@@ -101 +101 @@
                 self.VERSION = version
                 if self.VERSION > 0.8:
-                        self.new_ticket = ticket.Ticket
                         self.get_config = self.env.config.get
                 else:
-                        self.new_ticket = Ticket.Ticket
                         self.get_config = self.env.get_config
 
@@ -147 +145 @@
 
                         if number >= self.SPAM_LEVEL:
-                                return number
-
-                return 0
+                                return 'Spam'
+
+                return self.get_config('ticket', 'default_component') 
 
         def to_unicode(self, str):
@@ -246 +244 @@
 
                 self.db = self.env.get_db_cnx()
-                tkt = self.new_ticket(self.env)
+                tkt = Ticket(self.env)
                 tkt['status'] = 'new'
 
@@ -262 +260 @@
 
 
-                if self.SPAM_LEVEL:
+                if settings.has_key('component'):
+                        tkt['component'] = settings['component']
+                else:
                         tkt['component'] = self.spam(msg)
-                elif settings.has_key('component'):
-                        tkt['component'] = settings['component']
-                else:
-                        tkt['component'] = self.get_config('ticket', 'default_component')
 
                 # Must make this an option or so, discard SPAM messages or save then
@@ -279 +275 @@
                 #
                 cursor = self.db.cursor()
-                sql = 'SELECT owner FROM component WHERE name=\'%s\'' % tkt['component']
+                sql = "SELECT owner FROM component WHERE name='%s'" % tkt['component']
                 cursor.execute(sql)
                 tkt['owner'] = cursor.fetchone()[0]
@@ -287 +283 @@
                 if author:
                         tkt['reporter'] = self.to_unicode(author)
-                else
+                else:
                         tkt['reporter'] = self.to_unicode(email_str)
 
@@ -347 +343 @@
                 #tkt.save_changes(self.db, author, "Lekker bezig")
                 #
+
                 self.attachments(msg, tkt, author)
-
+                if self.get_config('notification', 'smtp_enabled') in ['true']:
+                        self.notify(tkt)
+
+        def notify(self, tkt):
+                try:
+                        # create false {abs_}href properties, to trick Notify()
+                        #
+                        self.env.abs_href = Href(self.get_config('project', 'url'))
+                        self.env.href = Href(self.get_config('project', 'url'))
+
+                        tn = TicketNotifyEmail(self.env)
+                        tn.notify(tkt, newticket=True) 
+
+                except Exception, e:
+                        print "TD: Failure sending notification on creation of ticket #%s: %s" % (tkt.id, e)
 
         def mail_line(self, str):
@@ -540 +551 @@
 
         if version > 0.8:
-                from trac import attachment, config, env, ticket
-                env = env.Environment(settings['project'], create=0)
-                ticket_mod = ticket
+                from trac import attachment 
+                from trac.env import Environment
+                from trac.ticket import Ticket
+                from trac.Notify import TicketNotifyEmail
+                from trac.web.href import Href
         else:
-                from trac import Environment, Ticket
-                env = Environment.Environment(settings['project'], create=0)
-                ticket_mod = Ticket
-                
+                from trac.Environment import Environment
+                from trac.Ticket import Ticket
+                from trac.Notify import TicketNotifyEmail
+                from trac.Href import Href
+
+        env = Environment(settings['project'], create=0)
         tktparser = TicketEmailParser(env, settings, version)
         tktparser.parse(sys.stdin)