summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-12-20 17:50:04 -0300
committerTomás Touceda <chiiph@leap.se>2013-12-20 17:50:04 -0300
commit34bcd4d07c8c099f2a089133ad88e179d94865c3 (patch)
treec84bcf1eea06ddd49f84cfd3674d3c28db102571 /src/leap
parent460b704771d518e76cfe10cda520a1a0a688ce8c (diff)
parentd7157d12829494a600fb1d460c481b916e3f75be (diff)
Merge remote-tracking branch 'refs/remotes/kali/bug/use-soledad-writer-for-updates' into develop
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/mail/imap/server.py40
1 files changed, 32 insertions, 8 deletions
diff --git a/src/leap/mail/imap/server.py b/src/leap/mail/imap/server.py
index c79cf85..d92ab9d 100644
--- a/src/leap/mail/imap/server.py
+++ b/src/leap/mail/imap/server.py
@@ -755,7 +755,7 @@ class LeapMessage(WithMsgFields):
logger.error("Unicode error {0}".format(e))
content = content.encode(charset, 'replace')
fd.write(content)
- # SHOULD use a separate BODY FIELD ...
+ # XXX SHOULD use a separate BODY FIELD ...
fd.seek(0)
return fd
@@ -856,7 +856,12 @@ class SoledadDocWriter(object):
empty = queue.empty()
while not empty:
item = queue.get()
- self._soledad.create_doc(item)
+ payload = item['payload']
+ mode = item['mode']
+ if mode == "create":
+ self._soledad.create_doc(payload)
+ elif mode == "put":
+ self._soledad.put_doc(payload)
empty = queue.empty()
@@ -925,7 +930,7 @@ class MessageCollection(WithMsgFields, IndexedDB):
# to be processed serially by the consumer (the writer). We just
# need to `put` the new material on its plate.
- self._soledad_writer = MessageProducer(
+ self.soledad_writer = MessageProducer(
SoledadDocWriter(soledad),
period=0.1)
@@ -1003,7 +1008,10 @@ class MessageCollection(WithMsgFields, IndexedDB):
content[self.UID_KEY] = uid
logger.debug('enqueuing message for write')
- self._soledad_writer.put(content)
+
+ # XXX create namedtuple
+ self.soledad_writer.put({"mode": "create",
+ "payload": content})
# XXX have to decide what shall we do with errors with this change...
#return self._soledad.create_doc(content)
@@ -1422,7 +1430,22 @@ class SoledadMailbox(WithMsgFields):
leap_assert(isinstance(uid, int), "uid has to be int")
mbox = self._get_mbox()
key = self.LAST_UID_KEY
- mbox.content[key] = uid
+
+ count = mbox.getMessageCount()
+
+ # XXX safety-catch. If we do get duplicates,
+ # we want to avoid further duplication.
+
+ if uid >= count:
+ value = uid
+ else:
+ # something is wrong,
+ # just set the last uid
+ # beyond the max msg count.
+ logger.debug("WRONG uid < count. Setting last uid to ", count)
+ value = count
+
+ mbox.content[key] = value
self._soledad.put_doc(mbox)
last_uid = property(
@@ -1650,7 +1673,7 @@ class SoledadMailbox(WithMsgFields):
print "fetch %s, no msg found!!!" % msg_id
if self.isWriteable():
- deferToThread(self._unset_recent_flag)
+ self._unset_recent_flag()
return tuple(result)
@@ -1761,8 +1784,9 @@ class SoledadMailbox(WithMsgFields):
"""
Updates document in u1db database
"""
- #log.msg('updating doc... %s ' % doc)
- self._soledad.put_doc(doc)
+ # XXX create namedtuple
+ self.messages.soledad_writer.put({"mode": "put",
+ "payload": doc})
def __repr__(self):
"""