X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=mimedecode.py;h=5f3321c22fa73529108230a79516436cfa78e1cc;hb=049f238d8b23e2ab7f543b33d52dd2544ffa7b22;hp=62097e4808096650298dfe1070bde0e8da690c44;hpb=8ce5154649860e66ddb247bf94cb19b3b7c74013;p=mimedecode.git

diff --git a/mimedecode.py b/mimedecode.py
index 62097e4..5f3321c 100755
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -32,7 +32,11 @@ def output_headers(msg):
     for key, value in msg.items():
         output(key)
         output(": ")
-        output(value)
+        value = value.split(';', 1)
+        output(value[0])
+        if len(value) == 2:
+            output(";")
+            output(_decode_header(value[1], strip=False))
         output(os.linesep)
     output(os.linesep) # End of headers
 
@@ -214,6 +218,10 @@ def decode_body(msg, s):
         caps = mailcap.getcaps()
 
     content_type = msg.get_content_type()
+    if content_type.startswith('text/'):
+        charset = msg.get_content_charset()
+    else:
+        charset = None
     filename = tempfile.mktemp()
     command = None
 
@@ -231,18 +239,24 @@ def decode_body(msg, s):
         return s
 
     outfile = open(filename, 'wb')
+    if charset and isinstance(s, bytes):
+        s = s.decode(charset, "replace")
     if not isinstance(s, bytes):
         s = s.encode(g.default_encoding, "replace")
     outfile.write(s)
     outfile.close()
 
     pipe = os.popen(command, 'r')
-    s = pipe.read()
-    pipe.close()
+    new_s = pipe.read()
+    if pipe.close() is None: # result=0, Ok
+        s = new_s
     os.remove(filename)
 
     set_content_type(msg, "text/plain")
-    msg["X-MIME-Autoconverted"] = "from %s to text/plain by %s id %s" % (content_type, g.host_name, command.split()[0])
+    if s is new_s:
+        msg["X-MIME-Autoconverted"] = "from %s to text/plain by %s id %s" % (content_type, g.host_name, command.split()[0])
+    else:
+        msg["X-MIME-Autoconverted"] = "failed conversion from %s to text/plain by %s id %s" % (content_type, g.host_name, command.split()[0])
 
     return s