X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=mimedecode.py;h=0e15fe015d3bcaaaed707cd50e8f7fb5ae6ae81c;hb=9c35fa7761509941014db31c46ad7a6e5a6e8817;hp=96c3ea57c1132229977f63ee85ed95e7db4a3c7d;hpb=d10dabb4acb56f746624bd697ede70c686c0a174;p=mimedecode.git diff --git a/mimedecode.py b/mimedecode.py index 96c3ea5..0e15fe0 100755 --- 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,25 +20,26 @@ Broytman mimedecode.py version %s, %s """ % (__version__, __copyright__)) if exit: sys.exit(0) - -def usage(code=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] [filename] +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') sys.exit(code) -def output(s, outfile=sys.stdout): - outfile.write(s) +def output(s): + gopts.outfile.write(s) -def output_headers(msg, outfile=sys.stdout): +def output_headers(msg): unix_from = msg.get_unixfrom() if unix_from: output(unix_from + '\n') for key, value in msg.items(): - output("%s: %s\n" % (key, value), outfile) - output("\n", outfile) # End of headers + output("%s: %s\n" % (key, value)) + output("\n") # End of headers def recode(s, charset): @@ -177,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 @@ -190,7 +185,7 @@ def recode_charset(msg, s): s = recode2(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 @@ -223,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 = [] @@ -288,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"), @@ -299,31 +296,32 @@ class GlobalOptions: ignore_mask = [] # Ignore (skip, do not decode and do not include into output) error_mask = [] # Raise error if encounter one of these + input_filename = None + output_filename = None + gopts = GlobalOptions -def init(): +def get_opt(): from getopt import getopt, GetoptError try: - options, arguments = getopt(sys.argv[1:], 'hVcCDPf:d:p:b:e:i:t:', - ['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': @@ -342,6 +340,8 @@ def init(): gopts.ignore_mask.append(value) elif option == '-e': gopts.error_mask.append(value) + elif option == '-o': + gopts.output_filename = value else: usage(1) @@ -349,14 +349,49 @@ def init(): if __name__ == "__main__": - arguments = init() + arguments = get_opt() la = len(arguments) - if la >= 2: - usage(1) - if (la == 0) or (arguments[0] == '-'): + if la == 0: + gopts.input_filename = '-' + gopts.output_filename = '-' infile = sys.stdin + outfile = sys.stdout + elif la in (1, 2): + if (arguments[0] == '-'): + gopts.input_filename = '-' + infile = sys.stdin + else: + gopts.input_filename = arguments[0] + infile = open(arguments[0], 'r') + if la == 1: + if gopts.output_filename: + outfile = open(gopts.output_filename, 'w') + else: + gopts.output_filename = '-' + outfile = sys.stdout + elif la == 2: + if gopts.output_filename: + usage(1, 'Too many output filenames') + if (arguments[1] == '-'): + gopts.output_filename = '-' + outfile = sys.stdout + else: + gopts.output_filename = arguments[1] + outfile = open(arguments[1], 'w') else: - infile = open(arguments[0], 'r') + 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) + + infile.close() + outfile.close()