Serializable Models + Soledad Adaptor

1 files changed, 5 insertions, 127 deletions

diff --git a/src/leap/mail/imap/fields.py b/src/leap/mail/imap/fields.py
index 4576939..a751c6d 100644
--- a/src/leap/mail/imap/fields.py
+++ b/src/leap/mail/imap/fields.py
@@ -17,7 +17,9 @@
 """
 Fields for Mailbox and Message.
 """
-from leap.mail.imap.parser import MBoxParser
+
+# TODO deprecate !!! (move all to constants maybe?)
+# Flags -> foo
 
 
 class WithMsgFields(object):
@@ -25,55 +27,12 @@ class WithMsgFields(object):
     Container class for class-attributes to be shared by
     several message-related classes.
     """
-    # indexing
-    CONTENT_HASH_KEY = "chash"
-    PAYLOAD_HASH_KEY = "phash"
-
-    # Internal representation of Message
-
-    # flags doc
-    UID_KEY = "uid"
-    MBOX_KEY = "mbox"
-    SEEN_KEY = "seen"
-    DEL_KEY = "deleted"
-    RECENT_KEY = "recent"
-    FLAGS_KEY = "flags"
-    MULTIPART_KEY = "multi"
-    SIZE_KEY = "size"
-
-    # headers
-    HEADERS_KEY = "headers"
-    DATE_KEY = "date"
-    SUBJECT_KEY = "subject"
-    PARTS_MAP_KEY = "part_map"
-    BODY_KEY = "body"  # link to phash of body
-    MSGID_KEY = "msgid"
-
-    # content
-    LINKED_FROM_KEY = "lkf"  # XXX not implemented yet!
-    RAW_KEY = "raw"
-    CTYPE_KEY = "ctype"
-
     # Mailbox specific keys
-    CLOSED_KEY = "closed"
-    CREATED_KEY = "created"
-    SUBSCRIBED_KEY = "subscribed"
-    RW_KEY = "rw"
-    LAST_UID_KEY = "lastuid"
+    CREATED_KEY = "created"  # used???
+
     RECENTFLAGS_KEY = "rct"
     HDOCS_SET_KEY = "hdocset"
 
-    # Document Type, for indexing
-    TYPE_KEY = "type"
-    TYPE_MBOX_VAL = "mbox"
-    TYPE_FLAGS_VAL = "flags"
-    TYPE_HEADERS_VAL = "head"
-    TYPE_CONTENT_VAL = "cnt"
-    TYPE_RECENT_VAL = "rct"
-    TYPE_HDOCS_SET_VAL = "hdocset"
-
-    INBOX_VAL = "inbox"
-
     # Flags in Mailbox and Message
     SEEN_FLAG = "\\Seen"
     RECENT_FLAG = "\\Recent"
@@ -88,86 +47,5 @@ class WithMsgFields(object):
     SUBJECT_FIELD = "Subject"
     DATE_FIELD = "Date"
 
-    # Index  types
-    # --------------
-
-    TYPE_IDX = 'by-type'
-    TYPE_MBOX_IDX = 'by-type-and-mbox'
-    TYPE_MBOX_UID_IDX = 'by-type-and-mbox-and-uid'
-    TYPE_SUBS_IDX = 'by-type-and-subscribed'
-    TYPE_MSGID_IDX = 'by-type-and-message-id'
-    TYPE_MBOX_SEEN_IDX = 'by-type-and-mbox-and-seen'
-    TYPE_MBOX_RECT_IDX = 'by-type-and-mbox-and-recent'
-    TYPE_MBOX_DEL_IDX = 'by-type-and-mbox-and-deleted'
-    TYPE_MBOX_C_HASH_IDX = 'by-type-and-mbox-and-contenthash'
-    TYPE_C_HASH_IDX = 'by-type-and-contenthash'
-    TYPE_C_HASH_PART_IDX = 'by-type-and-contenthash-and-partnumber'
-    TYPE_P_HASH_IDX = 'by-type-and-payloadhash'
-
-    # Tomas created the `recent and seen index`, but the semantic is not too
-    # correct since the recent flag is volatile.
-    TYPE_MBOX_RECT_SEEN_IDX = 'by-type-and-mbox-and-recent-and-seen'
-
-    # Soledad index for incoming mail, without decrypting errors.
-    JUST_MAIL_IDX = "just-mail"
-    # XXX the backward-compatible index, will be deprecated at 0.7
-    JUST_MAIL_COMPAT_IDX = "just-mail-compat"
-
-    INCOMING_KEY = "incoming"
-    ERROR_DECRYPTING_KEY = "errdecr"
-
-    KTYPE = TYPE_KEY
-    MBOX_VAL = TYPE_MBOX_VAL
-    CHASH_VAL = CONTENT_HASH_KEY
-    PHASH_VAL = PAYLOAD_HASH_KEY
-
-    INDEXES = {
-        # generic
-        TYPE_IDX: [KTYPE],
-        TYPE_MBOX_IDX: [KTYPE, MBOX_VAL],
-        TYPE_MBOX_UID_IDX: [KTYPE, MBOX_VAL, UID_KEY],
-
-        # mailboxes
-        TYPE_SUBS_IDX: [KTYPE, 'bool(subscribed)'],
-
-        # fdocs uniqueness
-        TYPE_MBOX_C_HASH_IDX: [KTYPE, MBOX_VAL, CHASH_VAL],
-
-        # headers doc - search by msgid.
-        TYPE_MSGID_IDX: [KTYPE, MSGID_KEY],
-
-        # content, headers doc
-        TYPE_C_HASH_IDX: [KTYPE, CHASH_VAL],
-
-        # attachment payload dedup
-        TYPE_P_HASH_IDX: [KTYPE, PHASH_VAL],
-
-        # messages
-        TYPE_MBOX_SEEN_IDX: [KTYPE, MBOX_VAL, 'bool(seen)'],
-        TYPE_MBOX_RECT_IDX: [KTYPE, MBOX_VAL, 'bool(recent)'],
-        TYPE_MBOX_DEL_IDX: [KTYPE, MBOX_VAL, 'bool(deleted)'],
-        TYPE_MBOX_RECT_SEEN_IDX: [KTYPE, MBOX_VAL,
-                                  'bool(recent)', 'bool(seen)'],
-
-        # incoming queue
-        JUST_MAIL_IDX: [INCOMING_KEY,
-                        "bool(%s)" % (ERROR_DECRYPTING_KEY,)],
-
-        # the backward-compatible index, will be deprecated at 0.7
-        JUST_MAIL_COMPAT_IDX: [INCOMING_KEY],
-    }
-
-    MBOX_KEY = MBOX_VAL
-
-    EMPTY_MBOX = {
-        TYPE_KEY: MBOX_KEY,
-        TYPE_MBOX_VAL: MBoxParser.INBOX_NAME,
-        SUBJECT_KEY: "",
-        FLAGS_KEY: [],
-        CLOSED_KEY: False,
-        SUBSCRIBED_KEY: False,
-        RW_KEY: 1,
-        LAST_UID_KEY: 0
-    }
 
 fields = WithMsgFields  # alias for convenience