Changeset 585

Timestamp:

02/06/12 12:04:50 (11 years ago)

Author:

bas

Message:

added blog patch from Thomas Moschny, closes #287,#235,#175

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• email2trac.py.in (modified) (7 diffs)

trunk/ChangeLog

@@ +1 @@
+2.5.0 
+  * BLOG improvements by Thomas Moschny, closes #287,#235,#175:
+   - Tries to use the 'Date:' email header to set the date of the blog
+     post or comment.
+   - Allows overriding author and categories via subject parameters or
+     inline properties (see below).
+   - Does not add the 'blog_' prefix to the default (short-) name of a
+     blog entry anymore, as it would be rather redundant.
+   - Allows selecting a custom short name for the blog entry instead of
+     a default date-based short name. The custom short name may not
+     contain spaces. (Note that the TracFullBlogPlugin imposes
+     additional rules for valid short names.)
+   - Bugfix: Fixes crash wile processing mails with attachments (#175).
+   - Properly adds attachments to blog entries (#175).
+
+    Author: Thomas Moschny
+    Applied by: Bas van der Vlies
+
 2.4.7 
   * Some blog improvements. Removes 'blog:' from subject line and honors the 

trunk/debian/changelog

@@ +1 @@
+email2trac (2.5.0-1) stable; urgency=low
+
+  * New release 2.5.0, see ChangeLog 
+
+ -- Bas van der Vlies <basv@sara.nl>  Mon, 06 Feb 2012 12:02:58 +0100
+
 email2trac (2.4.7-1) stable; urgency=low
 

trunk/email2trac.py.in

@@ -1325 +1325 @@
             if self.system == 'discussion':
                 att = attachment.Attachment(self.env, 'discussion', 'topic/%s' % (self.id,))
+            elif self.system == 'blog':
+                att = attachment.Attachment(self.env, 'blog', '%s' % (self.id,))
             else:
                 s = 'Attach %s to ticket %d' %(filename, self.id)
@@ -1358 +1360 @@
 ########## Fullblog functions  #################################################
 
-    def blog(self, msg, subject, id): 
+    def blog(self, msg, subject, id, params): 
         """
         The blog create/update function
@@ -1372 +1374 @@
         req = Mock(authname='anonymous', perm=MockPerm(), args={})
 
-        if id: 
-
-            ## update blog
-            #
-            comment = BlogComment(self.env, id)
-            comment.author = self.author
-
-            message_parts = self.get_message_parts(msg)
+        ## parameters from the subject
+        #
+        params = self.str_to_dict((params or '').lstrip('?'))
+
+        ## preferably get the time from the email date header, or else
+        #  use current date and time
+        date = email.Utils.parsedate_tz(msg.get('date'))
+        if date:
+            dt = util.datefmt.to_datetime(email.Utils.mktime_tz(date), util.datefmt.utc)
+        else:
+            self.logger.warn("No valid date header found")
+            dt = util.datefmt.to_datetime(None, util.datefmt.utc)
+
+        ## blog entry affected
+        #
+        self.id = id or util.datefmt.format_datetime(dt, "%Y%m%d%H%M%S", util.datefmt.utc)
+
+        ## check wether a blog post exists
+        #
+        post = BlogPost(self.env, self.id)
+        force_update = self.properties.get('update', params.get('update'))
+
+        ## message parts
+        #
+        message_parts = self.get_message_parts(msg)
+        message_parts = self.unique_attachment_names(message_parts)
+
+        if post.get_versions() and not force_update:
+
+            ## add comment to blog entry
+            #
+            comment = BlogComment(self.env, self.id)
+            comment.author = self.properties.get('author', params.get('author', self.author))
             comment.comment = self.get_body_text(message_parts)
+            comment.time = dt
 
             if self.parameters.dry_run:
                 self.logger.info('DRY-RUN: not adding comment for blog entry "%s"' % id)
                 return
-            blog.create_comment(req, comment)
+            warnings = 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
+            ## create or update blog entry
+            #
+            post.author = self.properties.get('author', params.get('author', self.author))
+            post.categories = self.properties.get('categories', params.get('categories', ''))
             post.title = subject.strip()
-
-            message_parts = self.get_message_parts(msg)
+            post.publish_time = dt
             post.body = self.get_body_text(message_parts)
             
@@ -1404 +1427 @@
                 self.logger.info('DRY-RUN: not creating blog entry "%s"' % post.title)
                 return
-            blog.create_post(req, post, self.author, u'Created by email2trac', False)
+            warnings = blog.create_post(req, post, self.author, u'Created by email2trac', False)
+
+        ## check for problems
+        #
+        if warnings:
+            raise TracError(', '.join('blog:%s:%s' % (w[0], w[1]) for w in warnings))
+        
+        ## all seems well, attach attachments
+        #
+        self.attach_attachments(message_parts)
 
 
@@ -1696 +1728 @@
             self.logger.debug('Trac BLOG support enabled')
             blog_enabled = True
-            blog_regex = '''|(?P<blog>blog:(?P<blog_id>\w*))'''
+            blog_regex = '''|(?P<blog>blog(?P<blog_params>[?][^:]*)?:(?P<blog_id>\S*))'''
 
 
@@ -1740 +1772 @@
                 if result.group('blog'):
                     self.system = 'blog'
-                    self.blog(m, subject[result.end('blog'):], result.group('blog_id'))
+                    self.blog(m, subject[result.end('blog'):], result.group('blog_id'), result.group('blog_params'))
 
             if discussion_enabled:
@@ -2146 +2178 @@
 
                 att = attachment.Attachment(self.env, 'discussion', 'ticket/%s' % (self.id,), filename)
+
+            elif self.system == 'blog':
+
+                att = attachment.Attachment(self.env, 'blog', '%s' % (self.id,), filename)
 
             else: