Added some more yields to the soledad wrapper code.

4 files changed, 36 insertions, 22 deletions

diff --git a/service/pixelated/adapter/services/mail_service.py b/service/pixelated/adapter/services/mail_service.py
index 233d4d4a..46c3cfd1 100644
--- a/service/pixelated/adapter/services/mail_service.py
+++ b/service/pixelated/adapter/services/mail_service.py
@@ -13,6 +13,7 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+from twisted.internet import defer
 from pixelated.adapter.model.mail import InputMail
 from pixelated.adapter.services.tag_service import extract_reserved_tags
 
@@ -25,8 +26,9 @@ class MailService(object):
         self.search_engine = search_engine
         self.mail_sender = mail_sender
 
+    @defer.inlineCallbacks
     def all_mails(self):
-        return self.querier.all_mails()
+        defer.returnValue((yield self.querier.all_mails()))
 
     def mails(self, query, window_size, page):
         mail_ids, total = self.search_engine.search(query, window_size, page)
diff --git a/service/pixelated/adapter/soledad/soledad_facade_mixin.py b/service/pixelated/adapter/soledad/soledad_facade_mixin.py
index 2a50b17d..99a17df8 100644
--- a/service/pixelated/adapter/soledad/soledad_facade_mixin.py
+++ b/service/pixelated/adapter/soledad/soledad_facade_mixin.py
@@ -14,29 +14,35 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
 
+from twisted.internet import defer
 
 class SoledadDbFacadeMixin(object):
 
+    @defer.inlineCallbacks
     def get_all_flags(self):
-        return self.soledad.get_from_index('by-type', 'flags')
+        flags = yield self.soledad.get_from_index('by-type', 'flags')
+        defer.returnValue(flags)
 
     def get_all_flags_by_mbox(self, mbox):
         return self.soledad.get_from_index('by-type-and-mbox', 'flags', mbox) if mbox else []
 
+    @defer.inlineCallbacks
     def get_content_by_phash(self, phash):
-        content = self.soledad.get_from_index('by-type-and-payloadhash', 'cnt', phash) if phash else []
+        content = yield self.soledad.get_from_index('by-type-and-payloadhash', 'cnt', phash) if phash else []
         if len(content):
-            return content[0]
+            defer.returnValue(content[0])
 
+    @defer.inlineCallbacks
     def get_flags_by_chash(self, chash):
-        flags = self.soledad.get_from_index('by-type-and-contenthash', 'flags', chash) if chash else []
+        flags = yield self.soledad.get_from_index('by-type-and-contenthash', 'flags', chash) if chash else []
         if len(flags):
-            return flags[0]
+            defer.returnValue(flags[0])
 
+    @defer.inlineCallbacks
     def get_header_by_chash(self, chash):
-        header = self.soledad.get_from_index('by-type-and-contenthash', 'head', chash) if chash else []
+        header = yield self.soledad.get_from_index('by-type-and-contenthash', 'head', chash) if chash else []
         if len(header):
-            return header[0]
+            defer.returnValue(header[0])
 
     def get_recent_by_mbox(self, mbox):
         return self.soledad.get_from_index('by-type-and-mbox', 'rct', mbox) if mbox else []
diff --git a/service/pixelated/adapter/soledad/soledad_reader_mixin.py b/service/pixelated/adapter/soledad/soledad_reader_mixin.py
index 347938ed..dcc95bd4 100644
--- a/service/pixelated/adapter/soledad/soledad_reader_mixin.py
+++ b/service/pixelated/adapter/soledad/soledad_reader_mixin.py
@@ -18,6 +18,7 @@ import logging
 import quopri
 import re
 
+from twisted.internet import defer
 from pixelated.adapter.model.mail import PixelatedMail
 from pixelated.adapter.soledad.soledad_facade_mixin import SoledadDbFacadeMixin
 
@@ -27,19 +28,21 @@ logger = logging.getLogger(__name__)
 
 class SoledadReaderMixin(SoledadDbFacadeMixin, object):
 
+    @defer.inlineCallbacks
     def all_mails(self):
-        fdocs_chash = [(fdoc, fdoc.content['chash']) for fdoc in self.get_all_flags()]
+        fdocs_chash = [(fdoc, fdoc.content['chash']) for fdoc in (yield self.get_all_flags())]
         if len(fdocs_chash) == 0:
-            return []
-        return self._build_mails_from_fdocs(fdocs_chash)
+            defer.returnValue([])
+        defer.returnValue((yield self._build_mails_from_fdocs(fdocs_chash)))
 
+    @defer.inlineCallbacks
     def _build_mails_from_fdocs(self, fdocs_chash):
         if len(fdocs_chash) == 0:
-            return []
+            defer.returnValue([])
 
         fdocs_hdocs = []
         for fdoc, chash in fdocs_chash:
-            hdoc = self.get_header_by_chash(chash)
+            hdoc = yield self.get_header_by_chash(chash)
             if not hdoc:
                 continue
             fdocs_hdocs.append((fdoc, hdoc))
@@ -50,10 +53,10 @@ class SoledadReaderMixin(SoledadDbFacadeMixin, object):
             bdoc = self.get_content_by_phash(body_phash)
             if not bdoc:
                 continue
-            parts = self._extract_parts(hdoc.content)
+            parts = yield self._extract_parts(hdoc.content)
             fdocs_hdocs_bdocs_parts.append((fdoc, hdoc, bdoc, parts))
 
-        return [PixelatedMail.from_soledad(*raw_mail, soledad_querier=self) for raw_mail in fdocs_hdocs_bdocs_parts]
+        defer.returnValue([PixelatedMail.from_soledad(*raw_mail, soledad_querier=self) for raw_mail in fdocs_hdocs_bdocs_parts])
 
     def mail_exists(self, ident):
         return self.get_flags_by_chash(ident)
@@ -86,23 +89,25 @@ class SoledadReaderMixin(SoledadDbFacadeMixin, object):
         else:
             return str(raw)
 
+    @defer.inlineCallbacks
     def _extract_parts(self, hdoc, parts=None):
         if not parts:
             parts = {'alternatives': [], 'attachments': []}
 
         if hdoc['multi']:
             for part_key in hdoc.get('part_map', {}).keys():
-                self._extract_parts(hdoc['part_map'][part_key], parts)
+                yield self._extract_parts(hdoc['part_map'][part_key], parts)
         else:
             headers_dict = {elem[0]: elem[1] for elem in hdoc.get('headers', [])}
             if 'attachment' in headers_dict.get('Content-Disposition', ''):
                 parts['attachments'].append(self._extract_attachment(hdoc, headers_dict))
             else:
-                parts['alternatives'].append(self._extract_alternative(hdoc, headers_dict))
-        return parts
+                parts['alternatives'].append((yield self._extract_alternative(hdoc, headers_dict)))
+        defer.returnValue(parts)
 
+    @defer.inlineCallbacks
     def _extract_alternative(self, hdoc, headers_dict):
-        bdoc = self.get_content_by_phash(hdoc['phash'])
+        bdoc = yield self.get_content_by_phash(hdoc['phash'])
 
         if bdoc is None:
             logger.warning("No BDOC content found for message!!!")
@@ -110,7 +115,7 @@ class SoledadReaderMixin(SoledadDbFacadeMixin, object):
         else:
             raw_content = bdoc.content['raw']
 
-        return {'headers': headers_dict, 'content': raw_content}
+        defer.returnValue({'headers': headers_dict, 'content': raw_content})
 
     def _extract_attachment(self, hdoc, headers_dict):
         content_disposition = headers_dict['Content-Disposition']
diff --git a/service/pixelated/config/services.py b/service/pixelated/config/services.py
index 62b2f8ef..7b5b1f1d 100644
--- a/service/pixelated/config/services.py
+++ b/service/pixelated/config/services.py
@@ -38,13 +38,14 @@ class Services(object):
         self.keymanager = self.setup_keymanager(leap_session)
         self.draft_service = self.setup_draft_service(pixelated_mailboxes)
 
-        self.post_setup(soledad_querier, leap_session)
+        yield self.post_setup(soledad_querier, leap_session)
 
 
 
+    @defer.inlineCallbacks
     def post_setup(self, soledad_querier, leap_session):
         self.search_engine.index_mails(
-            mails=self.mail_service.all_mails(),
+            mails=(yield self.mail_service.all_mails()),
             callback=soledad_querier.mark_all_as_not_recent)
         soledad_querier.remove_duplicates()
         InputMail.FROM_EMAIL_ADDRESS = leap_session.account_email()