summaryrefslogtreecommitdiff
path: root/src/leap/mail/imap/mailbox.py
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2015-06-29 11:57:20 -0400
committerKali Kaneko <kali@leap.se>2015-06-29 13:12:47 -0400
commit0dbf2be49db228e43fe4b196199f82ea281886bf (patch)
tree2bc5b874323915bad2669cdd5085954bcbc3e418 /src/leap/mail/imap/mailbox.py
parentc0f3a6afa81f93f8d1b078a62e4411b2321ba9f0 (diff)
[bug] allow mailbox to be notified of collection changes
in a previous refactor, we decoupled the incoming mail service from the IMAP layer. However, this left the IMAPMailbox unable to react to changes in the underlying collection when a new message is inserted. in this commit, we add a Listener mechanism to the collection itself, so that IMAPMailbox (and any other object that uses it) can subscribe to changes on the number of messages of the collection. Resolves: #7191 Releases: 0.4.0
Diffstat (limited to 'src/leap/mail/imap/mailbox.py')
-rw-r--r--src/leap/mail/imap/mailbox.py14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/leap/mail/imap/mailbox.py b/src/leap/mail/imap/mailbox.py
index 139ae66..0de4b40 100644
--- a/src/leap/mail/imap/mailbox.py
+++ b/src/leap/mail/imap/mailbox.py
@@ -91,6 +91,8 @@ class IMAPMailbox(object):
imap4.IMailboxInfo,
imap4.ISearchableMailbox,
# XXX I think we do not need to implement CloseableMailbox, do we?
+ # We could remove ourselves from the collectionListener, although I
+ # think it simply will be garbage collected.
# imap4.ICloseableMailbox
imap4.IMessageCopier)
@@ -116,6 +118,7 @@ class IMAPMailbox(object):
self.rw = rw
self._uidvalidity = None
self.collection = collection
+ self.collection.addListener(self)
@property
def mbox_name(self):
@@ -155,9 +158,10 @@ class IMAPMailbox(object):
if not NOTIFY_NEW:
return
+ listeners = self.listeners
logger.debug('adding mailbox listener: %s. Total: %s' % (
- listener, len(self.listeners)))
- self.listeners.add(listener)
+ listener, len(listeners)))
+ listeners.add(listener)
def removeListener(self, listener):
"""
@@ -371,13 +375,16 @@ class IMAPMailbox(object):
d = self.collection.add_msg(message, flags, date=date,
notify_just_mdoc=notify_just_mdoc)
- d.addCallback(self.notify_new)
d.addErrback(lambda failure: log.err(failure))
return d
def notify_new(self, *args):
"""
Notify of new messages to all the listeners.
+ This will be called indirectly by the underlying collection, that will
+ notify this IMAPMailbox whenever there are changes in the number of
+ messages in the collection, since we have added ourselves to the
+ collection listeners.
:param args: ignored.
"""
@@ -392,6 +399,7 @@ class IMAPMailbox(object):
d = self._get_notify_count()
d.addCallback(cbNotifyNew)
d.addCallback(self.collection.cb_signal_unread_to_ui)
+ d.addErrback(lambda failure: log.err(failure))
def _get_notify_count(self):
"""