Rename recode2 => recode_if_needed

[mimedecode.git] / mimedecode.py

diff --git a/mimedecode.py b/mimedecode.py
index f46165b23936cf100e432c44640d0bf293496ac0..b1b18e3beab25ac36a34edf139097b1898400cfb 100755 (executable)
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -1,10 +1,8 @@
 #! /usr/bin/env python
 """Decode MIME message"""
 
-
 from mimedecode_version import __version__, __author__, __copyright__, __license__
 
-
 import sys, os
 import email
 
@@ -13,10 +11,6 @@ try:
 except ImportError:
     from StringIO import StringIO
 
-
-import socket
-host_name = socket.gethostname()
-
 me = os.path.basename(sys.argv[0])
 
 
@@ -26,11 +20,10 @@ Broytman mimedecode.py version %s, %s
 """ % (__version__, __copyright__))
     if exit: sys.exit(0)
 
-
 def usage(code=0, errormsg=''):
     version(0)
     sys.stdout.write("""\
-Usage: %s [-h|--help] [-V|--version] [-cCDP] [-f charset] [-d header] [-p header:param] [-beit mask] [-o output_file] [input_file [output_file]]
+Usage: %s [-h|--help] [-V|--version] [-cCDP] [-H|--host=hostname] [-f charset] [-d header] [-p header:param] [-beit mask] [-o output_file] [input_file [output_file]]
 """ % me)
     if errormsg:
         sys.stderr.write(errormsg + '\n')
@@ -53,7 +46,7 @@ def recode(s, charset):
     return unicode(s, charset, "replace").encode(gopts.default_encoding, "replace")
 
 
-def recode2(s, charset):
+def recode_if_needed(s, charset):
     if charset and charset.lower() <> gopts.default_encoding:
         s = recode(s, charset)
     return s
@@ -76,7 +69,7 @@ def _decode_header(s):
         if charset is None:
             rtn.append(atom)
         else:
-            rtn.append(recode2(atom, charset))
+            rtn.append(recode_if_needed(atom, charset))
         rtn.append(' ')
     del rtn[-1] # remove the last space
 
@@ -96,7 +89,7 @@ def decode_header(msg, header):
 
 
 def _decode_header_param(s):
-    return recode2(s[2], s[0])
+    return recode_if_needed(s[2], s[0])
 
 
 def decode_header_param(msg, header, param):
@@ -179,7 +172,7 @@ def decode_body(msg, 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, host_name, command.split()[0])
+    msg["X-MIME-Autoconverted"] = "from %s to text/plain by %s id %s" % (content_type, gopts.host_name, command.split()[0])
 
     return s
 
@@ -189,10 +182,10 @@ def recode_charset(msg, s):
 
     save_charset = charset = msg.get_content_charset()
     if charset and charset.lower() <> gopts.default_encoding:
-        s = recode2(s, charset)
+        s = recode_if_needed(s, charset)
         content_type = msg.get_content_type()
         set_content_type(msg, content_type, gopts.default_encoding)
-        msg["X-MIME-Autoconverted"] = "from %s to %s by %s id %s" % (save_charset, gopts.default_encoding, host_name, me)
+        msg["X-MIME-Autoconverted"] = "from %s to %s by %s id %s" % (save_charset, gopts.default_encoding, gopts.host_name, me)
     return s
 
 
@@ -225,7 +218,7 @@ def decode_part(msg):
     else: # Decode from transfer ecoding to text or binary form
         outstring = str(msg.get_payload(decode=1))
         set_header(msg, "Content-Transfer-Encoding", "8bit")
-        msg["X-MIME-Autoconverted"] = "from %s to 8bit by %s id %s" % (encoding, host_name, me)
+        msg["X-MIME-Autoconverted"] = "from %s to 8bit by %s id %s" % (encoding, gopts.host_name, me)
 
     # Test all mask lists and find what to do with this content type
     masks = []
@@ -290,6 +283,8 @@ class GlobalOptions:
     from m_lib.defenc import default_encoding
     recode_charset = 1 # recode charset of message body
 
+    host_name = None
+
     decode_headers = ["From", "Subject"] # A list of headers to decode
     decode_header_params = [
         ("Content-Type", "name"),
@@ -311,24 +306,22 @@ def get_opt():
     from getopt import getopt, GetoptError
 
     try:
-        options, arguments = getopt(sys.argv[1:], 'hVcCDPf:d:p:b:e:i:t:o:',
-            ['help', 'version'])
+        options, arguments = getopt(sys.argv[1:], 'hVcCDPH:f:d:p:b:e:i:t:o:',
+            ['help', 'version', 'host'])
     except GetoptError:
         usage(1)
 
     for option, value in options:
-        if option == '-h':
-            usage()
-        elif option == '--help':
+        if option in ('-h', '--help'):
             usage()
-        elif option == '-V':
-            version()
-        elif option == '--version':
+        elif option in ('-V', '--version'):
             version()
         elif option == '-c':
             gopts.recode_charset = 1
         elif option == '-C':
             gopts.recode_charset = 0
+        elif option in ('-H', '--host'):
+            gopts.host_name = value
         elif option == '-f':
             gopts.default_encoding = value
         elif option == '-d':
@@ -389,6 +382,14 @@ 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 not gopts.host_name:
+        import socket
+        gopts.host_name = socket.gethostname()
+
     gopts.outfile = outfile
     decode_file(infile)