allow selection of contenttype

Author: Felix Van der Jeugt

alot/commands/thread.py

@@ -1192,3 +1192,19 @@ def refresh_widgets():
         # flush index
         if self.flush:
             ui.apply_command(FlushCommand())
+
+@registerCommand(MODE, 'nextctype', help='display the next contenttype')
+class NextCTypeCommand(Command):
+
+    """display the next contenttype"""
+    repeatable = True
+
+    def __init__(self, **kwargs):
+        Command.__init__(self, **kwargs)
+
+    def apply(self, ui):
+        tbuffer = ui.current_buffer
+        message_tree = tbuffer.get_selected_messagetree()
+        message_tree.next_contenttype()
+        message_tree.reassemble()
+        tbuffer.refresh()

alot/db/utils.py

@@ -313,15 +313,29 @@ def extract_body(mail, types=None, field_key='copiousoutput'):
     :returns: The combined text of any parts to be used
     :rtype: str
     """
-
     preferred = 'text/plain' if settings.get(
         'prefer_plaintext') else 'text/html'
-    has_preferred = False
 
     # see if the mail has our preferred type
     if types is None:
-        has_preferred = list(typed_subpart_iterator(
-            mail, *preferred.split('/')))
+        types = list(typed_subpart_iterator(mail, *preferred.split('/')))
+
+    body_parts = extract_body_parts(mail, types=types, field_key=field_key)
+    return u'\n\n'.join(text for ctype, text in body_parts)
+
+
+def extract_body_parts(mail, types=None, field_key='copiousoutput'):
+    """Returns a string view of each body part of a Message.
+
+    If no preferred types are specified, all types are returned.
+
+    :param mail: the mail to use
+    :type mail: :class:`email.Message`
+    :param types: mime content types to use for body string
+    :type types: list[(str,str)]
+    :returns: The type and text of any parts to be used
+    :rtype: str
+    """
 
     body_parts = []
     for part in mail.walk():
@@ -333,16 +347,12 @@ def extract_body(mail, types=None, field_key='copiousoutput'):
         cd = part.get('Content-Disposition', '')
         if cd.startswith('attachment'):
             continue
-        # if the mail has our preferred type, we only keep this type
-        # note that if types != None, has_preferred always stays False
-        if has_preferred and ctype != preferred:
-            continue
 
         enc = part.get_content_charset() or 'ascii'
         raw_payload = part.get_payload(decode=True)
         if ctype == 'text/plain':
             raw_payload = string_decode(raw_payload, enc)
-            body_parts.append(string_sanitize(raw_payload))
+            body_parts.append((ctype, string_sanitize(raw_payload)))
         else:
             # get mime handler
             _, entry = settings.mailcap_find_match(ctype, key=field_key)
@@ -382,8 +392,8 @@ def extract_body(mail, types=None, field_key='copiousoutput'):
                     os.unlink(tempfile_name)
 
                 if rendered_payload:  # handler had output
-                    body_parts.append(string_sanitize(rendered_payload))
-    return u'\n\n'.join(body_parts)
+                    body_parts.append((ctype, string_sanitize(rendered_payload)))
+    return body_parts
 
 
 def decode_header(header, normalize=False):

alot/widgets/thread.py

@@ -14,7 +14,7 @@
 from .globals import AttachmentWidget
 from ..settings.const import settings
 from ..db.utils import decode_header, X_SIGNATURE_MESSAGE_HEADER
-from ..db.utils import extract_body
+from ..db.utils import extract_body_parts
 
 
 class MessageSummaryWidget(urwid.WidgetWrap):
@@ -73,6 +73,18 @@ def keypress(self, size, key):
         return key
 
 
+class ContenttypeWidget(urwid.WidgetWrap):
+    def __init__(self, types, current):
+        value_att = settings.get_theming_attribute('thread', 'header_value')
+
+        cols = []
+        cols.append(urwid.Text("content-type: "))
+        for i, ctype in enumerate(types):
+            cols.append(urwid.Text((value_att if i == current else None, ctype)))
+        cols = [('fixed', len(c.text), c) for c in cols]
+        urwid.WidgetWrap.__init__(self, urwid.Columns(cols, dividechars=1))
+
+
 class FocusableText(urwid.WidgetWrap):
     """Selectable Text used for nodes in our example"""
     def __init__(self, txt, att, att_focus):
@@ -172,6 +184,8 @@ def __init__(self, message, odd=True):
         self._default_headers_tree = None
         self.display_attachments = True
         self._attachments = None
+        self._current_contenttype = 0
+        self._content_parts = None
         self._maintree = SimpleTree(self._assemble_structure())
         CollapsibleTree.__init__(self, self._maintree)
 
@@ -205,6 +219,10 @@ def _assemble_structure(self):
             if attachmenttree is not None:
                 mainstruct.append((attachmenttree, None))
 
+            contenttype = self._get_contenttype()
+            if contenttype is not None:
+                mainstruct.append((contenttype, None))
+
             bodytree = self._get_body()
             if bodytree is not None:
                 mainstruct.append((bodytree, None))
@@ -236,15 +254,29 @@ def _get_source(self):
             self._sourcetree = TextlinesList(sourcetxt, att, att_focus)
         return self._sourcetree
 
+    def _get_content_parts(self):
+        if self._content_parts is None:
+            att = settings.get_theming_attribute('thread', 'body')
+            att_focus = settings.get_theming_attribute(
+                'thread', 'body_focus')
+
+            self._content_parts = [
+                (ctype,
+                 TextlinesList(text, att, att_focus))
+                for ctype, text
+                in extract_body_parts(self._message.get_email())]
+
+        return self._content_parts
+
     def _get_body(self):
-        if self._bodytree is None:
-            bodytxt = extract_body(self._message.get_email())
-            if bodytxt:
-                att = settings.get_theming_attribute('thread', 'body')
-                att_focus = settings.get_theming_attribute(
-                    'thread', 'body_focus')
-                self._bodytree = TextlinesList(bodytxt, att, att_focus)
-        return self._bodytree
+        return self._get_content_parts()[self._current_contenttype][1]
+
+    def _get_contenttype(self):
+        return ContenttypeWidget([ctype for ctype, _ in self._get_content_parts()], self._current_contenttype)
+
+    def next_contenttype(self):
+        self._current_contenttype += 1
+        self._current_contenttype %= len(self._get_content_parts())
 
     def _get_headers(self):
         if self.display_all_headers is True: