Avoid reloading message from disk if we already have it in RAM

mailpile · Oct 23, 2014 · d1000ef · d1000ef
1 parent 1ef3c99
commit d1000ef
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/mailpile/mail_source/__init__.py b/mailpile/mail_source/__init__.py
@@ -518,7 +518,7 @@ def _copy_new_messages(self, mbx_key, mbx_cfg,
                     # This forks off a scan job to index the message
                     config.index.scan_one_message(
                         session, mbx_key, loc, loc_key,
-                        wait=False, **scan_args)
+                        wait=False, msg_data=data, **scan_args)
 
                     stop_after -= 1
                     if stop_after == 0:

diff --git a/mailpile/search.py b/mailpile/search.py
@@ -1,3 +1,4 @@
+import cStringIO
 import email
 import lxml.html
 import re
@@ -701,7 +702,7 @@ def scan_one_message(self, session, mailbox_idx, mbox, msg_mbox_key,
 
     def _real_scan_one(self, session,
                        mailbox_idx, mbox, msg_mbox_idx,
-                       msg_ptr=None, last_date=None,
+                       msg_ptr=None, msg_data=None, last_date=None,
                        process_new=None, apply_tags=None, stop_after=None,
                        editable=False, event=None, progress=None):
         added = updated = 0
@@ -714,7 +715,10 @@ def _real_scan_one(self, session,
             session.ui.debug('Reading message %s/%s'
                              % (mailbox_idx, msg_mbox_idx))
         try:
-            msg_fd = mbox.get_file(msg_mbox_idx)
+            if msg_data:
+                msg_fd = cStringIO.StringIO(msg_data)
+            else:
+                msg_fd = mbox.get_file(msg_mbox_idx)
             msg = ParseMessage(msg_fd,
                                pgpmime=session.config.prefs.index_encrypted,
                                config=session.config)