diff options
| -rw-r--r-- | service/pixelated/adapter/pixelated_mail.py | 14 | ||||
| -rw-r--r-- | service/pixelated/adapter/soledad_querier.py | 2 | ||||
| -rw-r--r-- | service/setup.py | 14 |
3 files changed, 16 insertions, 14 deletions
diff --git a/service/pixelated/adapter/pixelated_mail.py b/service/pixelated/adapter/pixelated_mail.py index eab39759..3ff392b0 100644 --- a/service/pixelated/adapter/pixelated_mail.py +++ b/service/pixelated/adapter/pixelated_mail.py @@ -90,7 +90,6 @@ class PixelatedMail: recipients = temporary_headers[header_type].split(',') temporary_headers[header_type] = map(lambda x: x.lstrip(), recipients) - def mark_as_deleted(self): # self.remove_all_tags() # self.leap_mail.setFlags((Status.PixelatedStatus.DELETED,), 1) @@ -100,12 +99,12 @@ class PixelatedMail: self.update_tags(set([])) def update_tags(self, tags): - #old_tags = self.tags - #self.tags = tags - #removed = old_tags.difference(tags) - #added = tags.difference(old_tags) - #self._persist_mail_tags(tags) - #self.tag_service.notify_tags_updated(added, removed, self.ident) + # old_tags = self.tags + # self.tags = tags + # removed = old_tags.difference(tags) + # added = tags.difference(old_tags) + # self._persist_mail_tags(tags) + # self.tag_service.notify_tags_updated(added, removed, self.ident) return self.tags def mark_as_read(self): @@ -177,6 +176,7 @@ class PixelatedMail: date = headers['received'].split(";")[-1].strip() return dateparser.parse(date).isoformat() + def from_dict(mail_dict): mail = PixelatedMail() mail.headers = mail_dict.get('header', {}) diff --git a/service/pixelated/adapter/soledad_querier.py b/service/pixelated/adapter/soledad_querier.py index 8d0a7072..952c0606 100644 --- a/service/pixelated/adapter/soledad_querier.py +++ b/service/pixelated/adapter/soledad_querier.py @@ -19,5 +19,3 @@ class SoledadQuerier: fdocs_hdocs_phash = [(f[0], f[1], f[1].content.get('body')) for f in fdocs_hdocs] fdocs_hdocs_bdocs = [(f[0], f[1], self.soledad.get_from_index('by-type-and-payloadhash', 'cnt', f[2])[0]) for f in fdocs_hdocs_phash] return [PixelatedMail.from_soledad(*raw_mail) for raw_mail in fdocs_hdocs_bdocs] - - diff --git a/service/setup.py b/service/setup.py index 0821e28f..cb5fcf5c 100644 --- a/service/setup.py +++ b/service/setup.py @@ -26,9 +26,10 @@ import os def _folder_for(file): broken_path = file.split('/') - new_path = "web-ui/app/" + "/".join(broken_path[3:(len(broken_path) -1)]) + new_path = "web-ui/app/" + "/".join(broken_path[3:(len(broken_path) - 1)]) return new_path[0:-1] if new_path[-1] == '/' else new_path + def _create_data_files(original_files): data_files_hash = defaultdict(list) @@ -37,6 +38,7 @@ def _create_data_files(original_files): return data_files_hash.items() + def _web_ui_files(): web_ui_files = [] for root, dirname, filenames in os.walk('../web-ui/dist'): @@ -44,6 +46,7 @@ def _web_ui_files(): web_ui_files.append(os.path.join(root, filename)) return web_ui_files + def data_files(): certificates = ('pixelated/certificates', ['pixelated/certificates/example.wazokazi.is.ca.crt']) @@ -52,6 +55,7 @@ def data_files(): return _data_files + def read(fname): return open(os.path.join(os.path.dirname(__file__), fname)).read() @@ -86,10 +90,10 @@ setup(name='pixelated-user-agent', 'mockito' ], entry_points={ - 'console_scripts': [ - 'pixelated-user-agent = pixelated.user_agent:setup' - ] + 'console_scripts': [ + 'pixelated-user-agent = pixelated.user_agent:setup' + ] }, data_files=data_files(), include_package_data=True - ) + ) |