Refactoring: move subpart decoding inside decode_file

[mimedecode.git] / mimedecode.py

diff --git a/mimedecode.py b/mimedecode.py
index b82d12f96ee5dc945ebe593d3a2dd5c61026002b..6c29a9680c8bb927fdbfd5f1b7ef7ac53227b16f 100755 (executable)
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -30,9 +30,6 @@ Usage: %s [-h|--help] [-V|--version] [-cCDP] [-H|--host=hostname] [-f charset] [
     sys.exit(code)
 
 
-def output(s):
-    gopts.outfile.write(s)
-
 def output_headers(msg):
     unix_from = msg.get_unixfrom()
     if unix_from:
@@ -45,7 +42,6 @@ def output_headers(msg):
 def recode(s, charset):
     return unicode(s, charset, "replace").encode(gopts.default_encoding, "replace")
 
-
 def recode_if_needed(s, charset):
     if charset and charset.lower() <> gopts.default_encoding:
         s = recode(s, charset)
@@ -77,7 +73,6 @@ def _decode_header(s):
     # together into the final string.
     return ''.join(rtn)
 
-
 def decode_header(msg, header):
     "Decode mail header (if exists) and put it back, if it was encoded"
 
@@ -91,7 +86,6 @@ def decode_header(msg, header):
 def _decode_header_param(s):
     return recode_if_needed(s[2], s[0])
 
-
 def decode_header_param(msg, header, param):
     "Decode mail header's parameter (if exists) and put it back, if it was encoded"
 
@@ -191,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:
@@ -252,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)
@@ -261,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)
 
@@ -353,9 +348,12 @@ if __name__ == "__main__":
     la = len(arguments)
     if la == 0:
         gopts.input_filename = '-'
-        gopts.output_filename = '-'
         infile = sys.stdin
-        outfile = sys.stdout
+        if gopts.output_filename:
+            outfile = open(gopts.output_filename, 'w')
+        else:
+            gopts.output_filename = '-'
+            outfile = sys.stdout
     elif la in (1, 2):
         if (arguments[0] == '-'):
             gopts.input_filename = '-'
@@ -381,16 +379,20 @@ if __name__ == "__main__":
     else:
         usage(1, 'Too many arguments')
 
-    if (infile is sys.stdin) and (outfile is sys.stdout) and \
-            sys.stdin.isatty() and sys.stdout.isatty():
-        usage(1, 'Filtering from console to console is forbidden')
+    if (infile is sys.stdin) and sys.stdin.isatty():
+        if (outfile is sys.stdout) and sys.stdout.isatty():
+            usage()
+        usage(1, 'Filtering from console is forbidden')
 
     if not gopts.host_name:
         import socket
         gopts.host_name = socket.gethostname()
 
     gopts.outfile = outfile
-    decode_file(infile)
+    output = outfile.write
 
-    infile.close()
-    outfile.close()
+    try:
+        decode_file(infile)
+    finally:
+        infile.close()
+        outfile.close()