Refactoring: move subpart decoding inside decode_file

[mimedecode.git] / mimedecode.py

diff --git a/mimedecode.py b/mimedecode.py
index 692a0f0d700706799203af81c59a00b9e8df5ef6..6c29a9680c8bb927fdbfd5f1b7ef7ac53227b16f 100755 (executable)
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -185,12 +185,6 @@ def recode_charset(msg, s):
 def totext(msg, instring):
     "Convert instring content to text"
 
-    if msg.is_multipart(): # Recursively decode all parts of the multipart message
-        newfile = StringIO(msg.as_string())
-        newfile.seek(0)
-        decode_file(newfile)
-        return
-
     # Decode body and recode charset
     s = decode_body(msg, instring)
     if gopts.recode_charset:
@@ -246,7 +240,6 @@ def decode_file(infile):
     "Decode the entire message"
 
     msg = email.message_from_file(infile)
-    boundary = msg.get_boundary()
 
     if msg.is_multipart():
         decode_headers(msg)
@@ -255,9 +248,17 @@ def decode_file(infile):
         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()
+
         for subpart in msg.get_payload():
             output("\n--%s\n" % boundary)
-            decode_part(subpart)
+
+            if subpart.is_multipart(): # Recursively decode all parts of the subpart
+                newfile = StringIO(subpart.as_string())
+                newfile.seek(0)
+                decode_file(newfile)
+            else:
+                decode_part(subpart)
 
         output("\n--%s--\n" % boundary)