X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=mimedecode.py;h=9a23b7f36d934d6b828b35d151fdb634f81191b1;hb=2e48e7b8e360706ce666e1b343a20fb3a50b9b7b;hp=9db427893301d1455214134f1d6cbddde0d6738a;hpb=920712936a4106f6d0187dbeda4cf585c9244739;p=mimedecode.git

diff --git a/mimedecode.py b/mimedecode.py
index 9db4278..9a23b7f 100755
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -231,36 +231,38 @@ def decode_part(msg):
     totext(msg, outstring)
 
 
-def decode_message(msg):
-    "Decode message"
+def decode_multipart(msg):
+    "Decode multipart"
 
-    if msg.is_multipart():
-        decode_headers(msg)
-        output_headers(msg)
+    decode_headers(msg)
+    output_headers(msg)
 
-        if msg.preamble: # Preserve the first part, it is probably not a RFC822-message
-            output(msg.preamble) # Usually it is just a few lines of text (MIME warning)
+    if msg.preamble: # Preserve the first part, it is probably not a RFC822-message
+        output(msg.preamble) # Usually it is just a few lines of text (MIME warning)
 
-        boundary = msg.get_boundary()
+    boundary = msg.get_boundary()
 
-        for subpart in msg.get_payload():
-            if boundary:
-                output("\n--%s\n" % boundary)
+    for subpart in msg.get_payload():
+        if boundary:
+            output("\n--%s\n" % boundary)
 
-            if subpart.is_multipart(): # Recursively decode all parts of the subpart
-                decode_message(subpart)
-            else:
-                decode_part(subpart)
+        # Recursively decode all parts of the subpart
+        decode_message(subpart)
 
-        if boundary:
-            output("\n--%s--\n" % boundary)
+    if boundary:
+        output("\n--%s--\n" % boundary)
 
-        if msg.epilogue:
-            output(msg.epilogue)
+    if msg.epilogue:
+        output(msg.epilogue)
 
-    elif msg.has_key("Content-Type"): # Simple one-part message - decode it
-        decode_part(msg)
 
+def decode_message(msg):
+    "Decode message"
+
+    if msg.is_multipart():
+        decode_multipart(msg)
+    elif len(msg): # Simple one-part message (there are headers) - decode it
+        decode_part(msg)
     else: # Not a message, just text - copy it literally
         output(msg.as_string())
 
@@ -271,11 +273,15 @@ class GlobalOptions:
 
     host_name = None
 
-    decode_headers = ["From", "Subject"] # A list of headers to decode
+    # A list of headers to decode
+    decode_headers = ["From", "To", "Cc", "Reply-To", "Mail-Followup-To",
+                      "Subject"]
+
+    # A list of headers' parameters to decode
     decode_header_params = [
         ("Content-Type", "name"),
         ("Content-Disposition", "filename"),
-    ] # A list of headers' parameters to decode
+    ]
 
     totext_mask = [] # A list of content-types to decode
     binary_mask = [] # A list to pass through