Changeset 578 for trunk

Timestamp:

11/28/11 13:53:22 (12 years ago)

Author:

bas

Message:

commited patch by thomas moschny for blog support, see #235

File:

• trunk/email2trac.py.in (modified) (5 diffs)

trunk/email2trac.py.in

@@ -229 +229 @@
         if message.has_key(self.parameters.spam_header):
             spam_l = string.split(message[self.parameters.spam_header])
+            #self.logger.info('Spam header: %s' %(message[self.parameters.spam_header]))
 
             try:
@@ -1348 +1349 @@
 ########## Fullblog functions  #################################################
 
-    def blog(self, id): 
+    def blog(self, msg, subject, id): 
         """
         The blog create/update function
@@ -1369 +1370 @@
             comment.author = self.author
 
-            message_parts = self.get_message_parts(m)
+            message_parts = self.get_message_parts(msg)
             comment.comment = self.get_body_text(message_parts)
 
+            if self.parameters.dry_run:
+                self.logger.info('DRY-RUN: not adding comment for blog entry "%s"' % id)
+                return
             blog.create_comment(req, comment)
 
@@ -1383 +1387 @@
             
             post.author = self.author
-            post.title = self.email_to_unicode(m['Subject'])
-
-            message_parts = self.get_message_parts(m)
+            post.title = subject.strip()
+
+            message_parts = self.get_message_parts(msg)
             post.body = self.get_body_text(message_parts)
             
+            if self.parameters.dry_run:
+                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)
 
@@ -1724 +1731 @@
                 if result.group('blog'):
                     self.system = 'blog'
-                    self.blog(result.group('blog_id'))
+                    self.blog(m, subject[result.end('blog'):], result.group('blog_id'))
 
             if discussion_enabled: