summaryrefslogtreecommitdiff
path: root/service/pixelated/config
diff options
context:
space:
mode:
authorkaeff <hi@kaeff.net>2015-09-04 16:28:04 +0200
committerkaeff <hi@kaeff.net>2015-09-04 16:28:04 +0200
commit8c6a2155fd35180307eae39ae7c51ab56ab0efc2 (patch)
tree82ed1751eaa506096e01d9f7bad2f6ed8b340d55 /service/pixelated/config
parent1248a64f54f26484d20d710778a96783b0682de2 (diff)
Remove SoledadQuerier from Services
- Issues: #449, #432
Diffstat (limited to 'service/pixelated/config')
-rw-r--r--service/pixelated/config/services.py11
1 files changed, 4 insertions, 7 deletions
diff --git a/service/pixelated/config/services.py b/service/pixelated/config/services.py
index 9e3227da..0a689a4b 100644
--- a/service/pixelated/config/services.py
+++ b/service/pixelated/config/services.py
@@ -38,17 +38,15 @@ class Services(object):
self.keymanager = leap_session.nicknym
self.draft_service = self.setup_draft_service(leap_session.mail_store)
- yield self.post_setup(soledad_querier, leap_session)
+ yield self.index_all_mails()
def wrap_mail_store_with_indexing_mail_store(self, leap_session):
leap_session.mail_store = SearchableMailStore(leap_session.mail_store, self.search_engine)
@defer.inlineCallbacks
- def post_setup(self, soledad_querier, leap_session):
- self.search_engine.index_mails(
- mails=(yield self.mail_service.all_mails()))
- # yield soledad_querier.mark_all_as_not_recent()
- # yield soledad_querier.remove_duplicates()
+ def index_all_mails(self):
+ all_mails = yield self.mail_service.all_mails()
+ self.search_engine.index_mails(all_mails)
@defer.inlineCallbacks
def setup_search_engine(self, leap_home, search_index_storage_key):
@@ -67,7 +65,6 @@ class Services(object):
return MailService(
pixelated_mail_sender,
leap_session.mail_store,
- soledad_querier,
search_engine)
def setup_draft_service(self, mail_store):