From b509ff2f5faa63cca507505ede3d6708bfc4a8fa Mon Sep 17 00:00:00 2001 From: Bruno Wagner Date: Tue, 9 Jun 2015 17:33:06 -0300 Subject: AttachmentsResource don't need querier anymore, RootResource doesn't need it too --- service/pixelated/adapter/services/mail_service.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'service/pixelated/adapter') diff --git a/service/pixelated/adapter/services/mail_service.py b/service/pixelated/adapter/services/mail_service.py index 4e6b6aa8..233d4d4a 100644 --- a/service/pixelated/adapter/services/mail_service.py +++ b/service/pixelated/adapter/services/mail_service.py @@ -60,6 +60,9 @@ class MailService(object): def mail(self, mail_id): return self.querier.mail(mail_id) + def attachment(self, attachment_id, encoding): + return self.querier.attachment(attachment_id, encoding) + def mail_exists(self, mail_id): return not(not(self.querier.get_header_by_chash(mail_id))) -- cgit v1.2.3 From 42aa76d8463ffe73d5e22d178f8414cfdbd2730e Mon Sep 17 00:00:00 2001 From: Victor Shyba Date: Fri, 12 Jun 2015 15:48:04 -0300 Subject: [refactor] SearchEngine does not need a querier It was used only to retrieve encryption key. This should be done by who is using it. --- service/pixelated/adapter/search/__init__.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'service/pixelated/adapter') diff --git a/service/pixelated/adapter/search/__init__.py b/service/pixelated/adapter/search/__init__.py index da8845cc..b8d3e7ca 100644 --- a/service/pixelated/adapter/search/__init__.py +++ b/service/pixelated/adapter/search/__init__.py @@ -35,8 +35,8 @@ class SearchEngine(object): DEFAULT_INDEX_HOME = os.path.join(os.environ['HOME'], '.leap') DEFAULT_TAGS = ['inbox', 'sent', 'drafts', 'trash'] - def __init__(self, soledad_querier, agent_home=DEFAULT_INDEX_HOME): - self.soledad_querier = soledad_querier + def __init__(self, key, agent_home=DEFAULT_INDEX_HOME): + self.key = key self.index_folder = os.path.join(agent_home, 'search_index') if not os.path.exists(self.index_folder): os.makedirs(self.index_folder) @@ -111,8 +111,7 @@ class SearchEngine(object): raw=TEXT(stored=False)) def _create_index(self): - masterkey = self.soledad_querier.get_index_masterkey() - storage = EncryptedFileStorage(self.index_folder, masterkey) + storage = EncryptedFileStorage(self.index_folder, self.key) return FileIndex.create(storage, self._mail_schema(), indexname='mails') def index_mail(self, mail): -- cgit v1.2.3 From 8426d04f1b8ac437835780e9ff1ce77a93724dd3 Mon Sep 17 00:00:00 2001 From: Victor Shyba Date: Fri, 12 Jun 2015 17:27:08 -0300 Subject: [refactor] use flags property on mail Use it instead of reapeating fdoc.content[flags] --- service/pixelated/adapter/model/mail.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'service/pixelated/adapter') diff --git a/service/pixelated/adapter/model/mail.py b/service/pixelated/adapter/model/mail.py index 7c4223de..464e0343 100644 --- a/service/pixelated/adapter/model/mail.py +++ b/service/pixelated/adapter/model/mail.py @@ -393,6 +393,10 @@ class PixelatedMail(Mail): def uid(self): return self.fdoc.content['uid'] + @property + def flags(self): + return self.fdoc.content['flags'] + def save(self): return self.querier.save_mail(self) @@ -407,21 +411,21 @@ class PixelatedMail(Mail): return self.tags def mark_as_read(self): - if Status.SEEN in self.fdoc.content['flags']: + if Status.SEEN in self.flags: return self - self.fdoc.content['flags'].append(Status.SEEN) + self.flags.append(Status.SEEN) self.save() return self def mark_as_unread(self): - if Status.SEEN in self.fdoc.content['flags']: - self.fdoc.content['flags'].remove(Status.SEEN) + if Status.SEEN in self.flags: + self.flags.remove(Status.SEEN) self.save() return self def mark_as_not_recent(self): - if Status.RECENT in self.fdoc.content['flags']: - self.fdoc.content['flags'].remove(Status.RECENT) + if Status.RECENT in self.flags: + self.flags.remove(Status.RECENT) self.save() return self -- cgit v1.2.3