X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=mimedecode.py;h=b1b18e3beab25ac36a34edf139097b1898400cfb;hb=554b3f06f7f69d0f570ebac18b1d9161ac7ddf5f;hp=21ab3717a6a96386213d55462bd245d6c3d3d552;hpb=5419f42c6f82c81eddac47956910eb1ecc3c639e;p=mimedecode.git diff --git a/mimedecode.py b/mimedecode.py index 21ab371..b1b18e3 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,33 +20,34 @@ 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 + os.linesep) + 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): - return unicode(s, charset, "replace").encode(GlobalOptions.default_encoding, "replace") + return unicode(s, charset, "replace").encode(gopts.default_encoding, "replace") -def recode2(s, charset): - if charset and charset.lower() <> GlobalOptions.default_encoding: +def recode_if_needed(s, charset): + if charset and charset.lower() <> gopts.default_encoding: s = recode(s, charset) return s @@ -74,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 @@ -94,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): @@ -115,10 +110,10 @@ def decode_header_param(msg, header, param): def decode_headers(msg): "Decode message headers according to global options" - for header in GlobalOptions.decode_headers: + for header in gopts.decode_headers: decode_header(msg, header) - for header, param in GlobalOptions.decode_header_params: + for header, param in gopts.decode_header_params: decode_header_param(msg, header, param) @@ -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 @@ -186,11 +181,11 @@ def recode_charset(msg, s): "Recode charset of the message to the default charset" save_charset = charset = msg.get_content_charset() - if charset and charset.lower() <> GlobalOptions.default_encoding: - s = recode2(s, charset) + if charset and charset.lower() <> gopts.default_encoding: + s = recode_if_needed(s, charset) content_type = msg.get_content_type() - set_content_type(msg, content_type, GlobalOptions.default_encoding) - msg["X-MIME-Autoconverted"] = "from %s to %s by %s id %s" % (save_charset, GlobalOptions.default_encoding, host_name, me) + 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, gopts.host_name, me) return s @@ -205,7 +200,7 @@ def totext(msg, instring): # Decode body and recode charset s = decode_body(msg, instring) - if GlobalOptions.recode_charset: + if gopts.recode_charset: s = recode_charset(msg, s) output_headers(msg) @@ -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 = [] @@ -236,18 +231,18 @@ def decode_part(msg): masks.append('*/*') for content_type in masks: - if content_type in GlobalOptions.totext_mask: + if content_type in gopts.totext_mask: totext(msg, outstring) return - elif content_type in GlobalOptions.binary_mask: + elif content_type in gopts.binary_mask: output_headers(msg) output(outstring) return - elif content_type in GlobalOptions.ignore_mask: + elif content_type in gopts.ignore_mask: output_headers(msg) output("\nMessage body of type `%s' skipped.\n" % content_type) return - elif content_type in GlobalOptions.error_mask: + elif content_type in gopts.error_mask: raise ValueError, "content type `%s' prohibited" % content_type # Neither content type nor masks were listed - decode by default @@ -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,47 +296,52 @@ 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': - GlobalOptions.recode_charset = 1 + gopts.recode_charset = 1 elif option == '-C': - GlobalOptions.recode_charset = 0 + gopts.recode_charset = 0 + elif option in ('-H', '--host'): + gopts.host_name = value elif option == '-f': - GlobalOptions.default_encoding = value + gopts.default_encoding = value elif option == '-d': - GlobalOptions.decode_headers.append(value) + gopts.decode_headers.append(value) elif option == '-D': - GlobalOptions.decode_headers = [] + gopts.decode_headers = [] elif option == '-p': - GlobalOptions.decode_header_params.append(value.split(':', 1)) + gopts.decode_header_params.append(value.split(':', 1)) elif option == '-P': - GlobalOptions.decode_header_params = [] + gopts.decode_header_params = [] elif option == '-t': - GlobalOptions.totext_mask.append(value) + gopts.totext_mask.append(value) elif option == '-b': - GlobalOptions.binary_mask.append(value) + gopts.binary_mask.append(value) elif option == '-i': - GlobalOptions.ignore_mask.append(value) + gopts.ignore_mask.append(value) elif option == '-e': - GlobalOptions.error_mask.append(value) + gopts.error_mask.append(value) + elif option == '-o': + gopts.output_filename = value else: usage(1) @@ -347,16 +349,49 @@ def init(): if __name__ == "__main__": - arguments = init() + arguments = get_opt() la = len(arguments) if la == 0: + gopts.input_filename = '-' + gopts.output_filename = '-' infile = sys.stdin - elif la <> 1: - usage(1) - elif arguments[0] == '-': - 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()