X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=mimedecode.py;h=5f3321c22fa73529108230a79516436cfa78e1cc;hb=ebc42b7ab6fe7a4ad201dffd1faeddf4e83ba00d;hp=25d3db0efe83e1e5288442a79291acec9ca06eca;hpb=7e9054a5d0ac3fe950ae20b5cd730004e3c66579;p=mimedecode.git

diff --git a/mimedecode.py b/mimedecode.py
index 25d3db0..5f3321c 100755
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -218,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
 
@@ -235,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