Ticket #365: email2trac.patch

email2trac

@@ -1547 +1547 @@
         ## Get dissussion API component.
         #
         api = self.env[DiscussionApi]
-        context = self._create_context(content, subject)
+        args = {'forum' : self.id}
+        context = self._create_context(api, args, content, subject)
 
         ## Get forum for new topic.
         #
-        forum = api.get_forum(context, self.id)
+        forum = context.forum
 
         if not forum:
             self.logger.error("ERROR: Replied forum doesn't exist")
@@ -1568 +1569 @@
         ## Add topic to DB and commit it.
         #
         self._add_topic(api, context, topic)
-        self.db.commit()
 
     def discussion_topic_reply(self, content, subject):
 
@@ -1582 +1582 @@
         ## Get dissussion API component.
         #
         api = self.env[DiscussionApi]
-        context = self._create_context(content, subject)
+        args = {'topic' : self.id}
+        context = self._create_context(api, args, content, subject)
 
         ## Get replied topic.
         #
-        topic = api.get_topic(context, self.id)
+        topic = context.topic
 
         if not topic:
             self.logger.error("ERROR: Replied topic doesn't exist")
@@ -1603 +1604 @@
         ## Add message to DB and commit it.
         #
         self._add_message(api, context, message)
-        self.db.commit()
 
     def discussion_message_reply(self, content, subject):
 
@@ -1617 +1617 @@
         ## Get dissussion API component.
         #
         api = self.env[DiscussionApi]
-        context = self._create_context(content, subject)
+        args = {'message' : self.id}
+        context = self._create_context(api, args, content, subject)
 
         ## Get replied message.
         #
-        message = api.get_message(context, self.id)
+        message = context.message
 
         if not message:
             self.logger.error("ERROR: Replied message doesn't exist")
@@ -1638 +1639 @@
         ## Add message to DB and commit it.
         #
         self._add_message(api, context, message)
-        self.db.commit()
 
-    def _create_context(self, content, subject):
+    def _create_context(self, api, args, content, subject):
 
         ## Import modules.
         #
         from trac.mimeview import Context
         from trac.web.api import Request
+        from trac.web.session import Session
         from trac.perm import PermissionCache
 
         ## TODO: Read server base URL from config.
@@ -1671 +1672 @@
         req.authname = self.author
         req.perm = PermissionCache(self.env, self.author)
         req.locale = None
+        req.args = args
+        req.session = Session(env, req)
 
         ## Create and return context.
         #
         context = Context.from_request(req)
         context.realm = 'discussion-email2trac'
-        context.cursor = self.db.cursor()
+        context.db = self.env.get_db_cnx()
         context.content = content
         context.subject = subject
 
@@ -1686 +1689 @@
         context.content_parts = self.unique_attachment_names(
           context.content_parts)
 
+        api._prepare_context(context)
+
         return context
 
     def _add_topic(self, api, context, topic):
@@ -1703 +1708 @@
 
         ## Add a new topic.
         #
-        api.add_topic(context, topic)
+        new_topic_id = api.add_topic(context, topic)
 
         ## Get inserted topic with new ID.
         #
-        topic = api.get_topic_by_time(context, topic['time'])
+        topic = api.get_topic(context, new_topic_id)
 
         ## Attach attachments.
         #
@@ -1734 +1739 @@
 
         ## Add message.
         #
-        api.add_message(context, message)
+        new_msg_id = api.add_message(context, message)
 
         ## Get inserted message with new ID.
         #
-        message = api.get_message_by_time(context, message['time'])
+        message = api.get_message(context, new_msg_id)
 
         ## Attach attachments.
         #