Ticket #116: email2trac_blog.3.patch

.py

@@ -581 +581 @@
                 else:
                         subject  = self.email_to_unicode(m['Subject'])
 
-                # [hic] #1529: Re: LRZ
-                # [hic] #1529?owner=bas,priority=medium: Re: LRZ
-                #
-                TICKET_RE = re.compile(r"""
-                                        (?P<ticketnr>[#][0-9]+:)
-                                        |(?P<ticketnr_fields>[#][\d]+\?.*?:)
-                                        """, re.VERBOSE)
-
-                result =  TICKET_RE.search(subject)
-                if not result:
-                        return False
-
                 # Must we update ticket fields
                 #
                 update_fields = dict()
@@ -839 +827 @@
                 else:
                         self.notification = 0
 
-                # Must we update existing tickets
-                #
-                if self.TICKET_UPDATE > 0:
-                        if self.ticket_update(m, spam_msg):
-                                return True
+                # Find out if this is a ticket or a blog
+                if not m['Subject']:
+                        return False
+                else:
+                        subject  = self.email_to_unicode(m['Subject'])          
+
+                TICKET_RE=re.compile(r"""
+                                        (?P<blog>blog:(?P<blog_id>\w*))
+                                        |(?P<ticket>\#(?P<ticket_id>[0-9]*):)
+                                        """, re.VERBOSE)
+                
+                result =  TICKET_RE.search(subject)
+
+        
+                print "action:"
+                if result:
+                        if result.group('blog'):
+                                # instantiate blog core
+                                blog = FullBlogCore(self.env)
+                                req = ''
+
+                                if result.group('blog_id'):
+                                        # update blog
+                                        comment = BlogComment(self.env, result.group('blog_id'))
+                                        comment.author = self.author
+                                        comment.comment = self.get_body_text(m)
+
+                                        blog.create_comment(req, comment)
+
+                                else:
+                                        # create blog
+                                        import time
+                                        post = BlogPost(self.env, 'blog_'+time.strftime("%Y%m%d%H%M%S", time.gmtime()))
+                                        #post = BlogPost(self.env, blog._get_default_postname(self.env))
+                                                                                
+                                        post.author = self.author
+                                        post.title = self.email_to_unicode(m['Subject'])
+                                        post.body = self.get_body_text(m)
 
-                self.new_ticket(m, spam_msg)
+                                        blog.create_post(req, post, self.author, u'Created by email2trac', False)
+
+                        else:
+                                if result.group('ticket_id') and self.TICKET_UPDATE:
+                                        # update ticket
+                                        self.ticket_update(m, spam_msg)
+                                        print "ticket update"
+                                else:
+                                        # create ticket
+                                        self.new_ticket(m, spam_msg)
+                                        print "ticket create"
+                else:
+                        print "nothing"
 
         def strip_signature(self, text):
                 """
@@ -1266 +1299 @@
                         from trac.web.href import Href
                         from trac import config as trac_config
                         from trac import util
+
+                        # blog enhancements
+                        from tracfullblog.core import FullBlogCore
+                        from tracfullblog.model import BlogPost, BlogComment
+
                         #
                         # return  util.text.to_unicode(str)
                         #