From a68c0cb3dc58a9040a3ad61033742f5a04cc3648 Mon Sep 17 00:00:00 2001 From: Bruno Wagner Goncalves Date: Mon, 22 Sep 2014 21:28:59 -0300 Subject: Added a querier to avoid duplicating the queries (must find a proper place yet) and tweaked pixelated mail to better use the docs --- service/pixelated/adapter/mail_service.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'service/pixelated/adapter/mail_service.py') diff --git a/service/pixelated/adapter/mail_service.py b/service/pixelated/adapter/mail_service.py index 60f985da..55407c8d 100644 --- a/service/pixelated/adapter/mail_service.py +++ b/service/pixelated/adapter/mail_service.py @@ -14,6 +14,8 @@ # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see . from pixelated.adapter.tag_service import TagService +from pixelated.adapter.pixelated_mail import PixelatedMail +from pixelated.adapter.soledad_querier import SoledadQuerier class MailService: @@ -24,15 +26,12 @@ class MailService: def __init__(self, mailboxes, mail_sender, tag_service=TagService.get_instance()): self.tag_service = tag_service self.mailboxes = mailboxes + self.querier = SoledadQuerier(self.mailboxes.account._soledad) self.mail_sender = mail_sender self.tag_service.load_index(self.mails(MailService.ALL_MAILS_QUERY)) def mails(self, query): - _mails = None - - if query['tags']: - _mails = self.mailboxes.mails_by_tag(query['tags']) - + _mails = self.mailboxes.mails_by_tag(query['tags']) if query['tags'] else self.querier.all_mails() return sorted(_mails or [], key=lambda mail: mail.headers['date'], reverse=True) def update_tags(self, mail_id, new_tags): -- cgit v1.2.3