From 54538e2f203b9d82ed2303b6a3ef8d1730517a7a Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Thu, 19 Dec 2013 13:30:10 -0400 Subject: deferToThread unsetting recent flag --- mail/changes/bug_defer-unset-recent | 2 ++ mail/src/leap/mail/imap/server.py | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 mail/changes/bug_defer-unset-recent diff --git a/mail/changes/bug_defer-unset-recent b/mail/changes/bug_defer-unset-recent new file mode 100644 index 00000000..e651d113 --- /dev/null +++ b/mail/changes/bug_defer-unset-recent @@ -0,0 +1,2 @@ + o deferToThread unsetting of recent flag. this was holding the new + mails from being displayed soonish. diff --git a/mail/src/leap/mail/imap/server.py b/mail/src/leap/mail/imap/server.py index b79e6918..c79cf856 100644 --- a/mail/src/leap/mail/imap/server.py +++ b/mail/src/leap/mail/imap/server.py @@ -31,8 +31,10 @@ from zope.proxy import sameProxiedObjects from twisted.mail import imap4 from twisted.internet import defer +from twisted.internet.threads import deferToThread from twisted.python import log + from leap.common import events as leap_events from leap.common.events.events_pb2 import IMAP_UNREAD_MAIL from leap.common.check import leap_assert, leap_assert_type @@ -1648,7 +1650,8 @@ class SoledadMailbox(WithMsgFields): print "fetch %s, no msg found!!!" % msg_id if self.isWriteable(): - self._unset_recent_flag() + deferToThread(self._unset_recent_flag) + return tuple(result) def _unset_recent_flag(self): @@ -1668,6 +1671,7 @@ class SoledadMailbox(WithMsgFields): session is the first session to be notified about a message, then that message SHOULD be considered recent. """ + log.msg('unsetting recent flags...') for msg in (LeapMessage(doc) for doc in self.messages.recent_iter()): newflags = msg.removeFlags((WithMsgFields.RECENT_FLAG,)) self._update(newflags) -- cgit v1.2.3