Refactor decode_file

[mimedecode.git] / mimedecode.py

diff --git a/mimedecode.py b/mimedecode.py
index 78783ae6e2e7ffe930d5db226d54851e2433f7fe..884f3582dd2b6b6987787b093623199bb4fddad0 100755 (executable)
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -6,11 +6,6 @@ from mimedecode_version import __version__, __author__, __copyright__, __license
 import sys, os
 import email
 
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from StringIO import StringIO
-
 me = os.path.basename(sys.argv[0])
 
 
@@ -185,12 +180,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:
@@ -242,11 +231,8 @@ def decode_part(msg):
     totext(msg, outstring)
 
 
-def decode_file(infile):
-    "Decode the entire message"
-
-    msg = email.message_from_file(infile)
-    boundary = msg.get_boundary()
+def decode_message(msg):
+    "Decode message"
 
     if msg.is_multipart():
         decode_headers(msg)
@@ -255,11 +241,19 @@ 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 boundary:
+                output("\n--%s\n" % boundary)
 
-        output("\n--%s--\n" % boundary)
+            if subpart.is_multipart(): # Recursively decode all parts of the subpart
+                decode_message(subpart)
+            else:
+                decode_part(subpart)
+
+        if boundary:
+            output("\n--%s--\n" % boundary)
 
         if msg.epilogue:
             output(msg.epilogue)
@@ -390,7 +384,8 @@ if __name__ == "__main__":
     gopts.outfile = outfile
     output = outfile.write
 
-    decode_file(infile)
-
-    infile.close()
-    outfile.close()
+    try:
+        decode_message(email.message_from_file(infile))
+    finally:
+        infile.close()
+        outfile.close()