diff options
Diffstat (limited to 'service/pixelated')
| -rw-r--r-- | service/pixelated/adapter/mail_service.py | 19 | ||||
| -rw-r--r-- | service/pixelated/adapter/pixelated_mailbox.py | 7 | ||||
| -rw-r--r-- | service/pixelated/adapter/tag.py | 7 |
3 files changed, 22 insertions, 11 deletions
diff --git a/service/pixelated/adapter/mail_service.py b/service/pixelated/adapter/mail_service.py index 1f4279e7..d9c30e51 100644 --- a/service/pixelated/adapter/mail_service.py +++ b/service/pixelated/adapter/mail_service.py @@ -21,8 +21,8 @@ from pixelated.bitmask_libraries.config import LeapConfig from pixelated.bitmask_libraries.provider import LeapProvider from pixelated.bitmask_libraries.session import LeapSessionFactory from pixelated.bitmask_libraries.auth import LeapCredentials -from pixelated.adapter.pixelated_mail import PixelatedMail from pixelated.adapter.pixelated_mailbox import PixelatedMailbox +from pixelated.adapter.tag import Tag class MailService: @@ -55,20 +55,19 @@ class MailService: def update_tags(self, mail_id, new_tags): mail = self.mail(mail_id) new_tags = mail.update_tags(new_tags) - self._update_flags(new_tags, mail_id) - self._update_tag_list(new_tags) + self._update_mail_flags(new_tags, mail_id) + self._update_mailbox_tags(new_tags) return new_tags - def _update_tag_list(self, tags): - for tag in tags: - pass - # self.tags.add(tag) + def _update_mailbox_tags(self, str_tags): + tags = [Tag(str_tag) for str_tag in str_tags] + self.mailbox.update_tags(tags) - def _update_flags(self, new_tags, mail_id): + def _update_mail_flags(self, new_tags, mail_id): new_tags_flag_name = ['tag_' + tag.name for tag in new_tags if tag.name not in PixelatedMailbox.SPECIAL_TAGS] - self.set_flags(mail_id, new_tags_flag_name) + self._set_mail_flags(mail_id, new_tags_flag_name) - def set_flags(self, mail_id, new_tags_flag_name): + def _set_mail_flags(self, mail_id, new_tags_flag_name): observer = defer.Deferred() leap_mailbox = self.account.getMailbox(self.mailbox_name) self.mailbox.messages.set_flags(leap_mailbox, [mail_id], tuple(new_tags_flag_name), 1, observer) diff --git a/service/pixelated/adapter/pixelated_mailbox.py b/service/pixelated/adapter/pixelated_mailbox.py index 501d179d..7521de6e 100644 --- a/service/pixelated/adapter/pixelated_mailbox.py +++ b/service/pixelated/adapter/pixelated_mailbox.py @@ -42,3 +42,10 @@ class PixelatedMailbox: def all_tags(self): return Tag.from_flags(self.leap_mailbox.getFlags()) + + def update_tags(self, tags): + new_flags = set(tag.to_flag() for tag in tags) + current_flags = set(self.leap_mailbox.getFlags()) + + flags = tuple(current_flags.union(new_flags)) + self.leap_mailbox.setFlags(flags) diff --git a/service/pixelated/adapter/tag.py b/service/pixelated/adapter/tag.py index 8d1d209d..386ccafc 100644 --- a/service/pixelated/adapter/tag.py +++ b/service/pixelated/adapter/tag.py @@ -13,7 +13,6 @@ # # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see <http://www.gnu.org/licenses/>. -import json class Tag: @@ -36,6 +35,12 @@ class Tag: return Tag(cls._remove_prefix(flag)) return None + def to_flag(self): + for flag, tag in self.LEAP_FLAGS_TAGS.items(): + if tag == str(self.name): + return flag + return 'tag_' + str(self.name) + @classmethod def _remove_prefix(cls, flag_name): return flag_name.replace('tag_', '', 1) |