summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Wagner <bwagner@thoughtworks.com>2014-10-28 16:25:17 +0100
committerBruno Wagner <bwagner@thoughtworks.com>2014-10-28 16:25:32 +0100
commitef407ef245e9509cc6a956fc5109be6cb3399760 (patch)
treedda7d5a2e99108009db7fcc76d63b19b3ea3c9d9
parent978681794f1c03ca97d8c8db2c06a107cc104916 (diff)
Fixed raw mail indexing
-rw-r--r--service/pixelated/adapter/mail.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/service/pixelated/adapter/mail.py b/service/pixelated/adapter/mail.py
index bba988d6..24ee797d 100644
--- a/service/pixelated/adapter/mail.py
+++ b/service/pixelated/adapter/mail.py
@@ -66,11 +66,12 @@ class Mail:
self._mime = mime
return mime
+ @property
def raw(self):
return self._mime_multipart.as_string()
def _get_chash(self):
- return sha256.SHA256(self.raw()).hexdigest()
+ return sha256.SHA256(self.raw).hexdigest()
def as_dict(self):
return {
@@ -92,8 +93,8 @@ class InputMail(Mail):
self._fd = None
self._hd = None
self._bd = None
- self._mime = None
self._chash = None
+ self._mime = None
@property
def ident(self):
@@ -112,7 +113,7 @@ class InputMail(Mail):
fd[fields.MBOX_KEY] = mailbox
fd[fields.UID_KEY] = next_uid
fd[fields.CONTENT_HASH_KEY] = self._get_chash()
- fd[fields.SIZE_KEY] = len(self.raw())
+ fd[fields.SIZE_KEY] = len(self.raw)
fd[fields.MULTIPART_KEY] = True
fd[fields.RECENT_KEY] = True
fd[fields.TYPE_KEY] = fields.TYPE_FLAGS_VAL
@@ -196,6 +197,7 @@ class PixelatedMail(Mail):
mail.fdoc = fdoc
mail.hdoc = hdoc
mail.querier = soledad_querier
+ mail._mime = None
return mail
@property