X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=mimedecode.py;h=0714c874863da054c9f9b01f9b0a0e4d7958d551;hb=fc09d21b965308d826973fd6e897bdc66a406830;hp=01f650563060eb085b6811295a8ee8ce267c2744;hpb=d0300ffa1ef1f9afee0e4d53c725f54773d89c13;p=mimedecode.git diff --git a/mimedecode.py b/mimedecode.py index 01f6505..0714c87 100755 --- a/mimedecode.py +++ b/mimedecode.py @@ -1,10 +1,9 @@ #! /usr/bin/env python """Decode MIME message""" -from mimedecode_version import __version__, __author__, __copyright__, __license__ - import sys, os -import email +from mimedecode_version import __version__, \ + __author__, __copyright__, __license__ me = os.path.basename(sys.argv[0]) @@ -21,17 +20,17 @@ def usage(code=0, errormsg=''): Usage: %s [-h|--help] [-V|--version] [-cCDP] [-H|--host=hostname] [-f charset] [-d header1[,h2,...]|*[,-h1,...]] [-p header1[,h2,h3,...]:param1[,p2,p3,...]] [-r header1[,h2,...]|*[,-h1,...]] [-R header1[,h2,h3,...]:param1[,p2,p3,...]] [--set-header header:value] [--set-param header:param=value] [-Bbeit mask] [--save-headers|body|message mask] [-O dest_dir] [-o output_file] [input_file [output_file]] """ % me) if errormsg: - sys.stderr.write(errormsg + '\n') + sys.stderr.write(errormsg + os.linesep) sys.exit(code) def output_headers(msg): unix_from = msg.get_unixfrom() if unix_from: - output(unix_from + '\n') + output(unix_from + os.linesep) for key, value in msg.items(): - output("%s: %s\n" % (key, value)) - output("\n") # End of headers + output("%s: %s%s" % (key, value, os.linesep)) + output(os.linesep) # End of headers def recode_if_needed(s, charset): @@ -223,9 +222,9 @@ def decode_body(msg, s): if not command: return s - file = open(filename, 'w') - file.write(s) - file.close() + outfile = open(filename, 'wb') + outfile.write(s) + outfile.close() pipe = os.popen(command, 'r') s = pipe.read() @@ -263,6 +262,18 @@ def totext(msg, instring): return s +mimetypes = None + +def _guess_extension(ctype): + global mimetypes + if mimetypes is None: + import mimetypes + mimetypes.init() + user_mime_type = os.path.expanduser('~/.mime.types') + if os.path.exists(user_mime_type): + mimetypes._db.read(user_mime_type) + return mimetypes.guess_extension(ctype) + def _save_message(msg, outstring, save_headers=False, save_body=False): for header, param in ( ("Content-Disposition", "filename"), @@ -270,16 +281,27 @@ def _save_message(msg, outstring, save_headers=False, save_body=False): ): fname = msg.get_param(param, header=header) if fname: + if isinstance(fname, tuple): + fname = fname[2] # Do not recode if it isn't recoded yet + try: + for forbidden in chr(0), '/', '\\': + if forbidden in fname: + raise ValueError + except ValueError: + continue fname = '-' + fname break else: fname = '' g.save_counter += 1 fname = str(g.save_counter) + fname + if '.' not in fname: + ext = _guess_extension(msg.get_content_type()) + if ext: fname += ext global output save_output = output - outfile = open(os.path.join(g.destination_dir, fname), 'w') + outfile = open_output_file(fname) output = outfile.write if save_headers: output_headers(msg) @@ -299,8 +321,7 @@ def decode_part(msg): ctype = msg.get_content_type() if ctype: masks.append(ctype) - mtype = msg.get_content_maintype() - if mtype: + mtype = ctype.split('/')[0] masks.append(mtype + '/*') masks.append('*/*') @@ -332,7 +353,7 @@ def decode_part(msg): break elif content_type in g.ignore_mask: output_headers(msg) - output("\nMessage body of type %s skipped.\n" % ctype) + output("%sMessage body of type %s skipped.%s" % (os.linesep, ctype, os.linesep)) break elif content_type in g.error_mask: break @@ -361,7 +382,7 @@ def decode_multipart(msg): if msg.preamble: # Preserve the first part, it is probably not a RFC822-message output(msg.preamble) # Usually it is just a few lines of text (MIME warning) if msg.preamble is not None: - output("\n") + output(os.linesep) first_subpart = True boundary = msg.get_boundary() @@ -371,14 +392,14 @@ def decode_multipart(msg): if first_subpart: first_subpart = False else: - output("\n") - output("--%s\n" % boundary) + output(os.linesep) + output("--%s%s" % (boundary, os.linesep)) # Recursively decode all parts of the subpart decode_message(subpart) if boundary: - output("\n--%s--\n" % boundary) + output("%s--%s--%s" % (os.linesep, boundary, os.linesep)) if msg.epilogue: output(msg.epilogue) @@ -395,6 +416,19 @@ def decode_message(msg): output(msg.as_string()) +def open_output_file(filename): + fullpath = os.path.abspath(os.path.join(g.destination_dir, filename)) + full_dir = os.path.dirname(fullpath) + create = not os.path.isdir(full_dir) + if create: + os.makedirs(full_dir) + try: + return open(fullpath, 'wb') + except: + if create: + os.removedirs(full_dir) + + class GlobalOptions: from m_lib.defenc import default_encoding recode_charset = 1 # recode charset of message body @@ -521,7 +555,7 @@ if __name__ == "__main__": g.input_filename = '-' infile = sys.stdin if g.output_filename: - outfile = open(os.path.join(g.destination_dir, g.output_filename), 'w') + outfile = open_output_file(g.output_filename) else: g.output_filename = '-' outfile = sys.stdout @@ -534,7 +568,7 @@ if __name__ == "__main__": infile = open(arguments[0], 'r') if la == 1: if g.output_filename: - outfile = open(os.path.join(g.destination_dir, g.output_filename), 'w') + outfile = open_output_file(g.output_filename) else: g.output_filename = '-' outfile = sys.stdout @@ -546,7 +580,7 @@ if __name__ == "__main__": outfile = sys.stdout else: g.output_filename = arguments[1] - outfile = open(os.path.join(g.destination_dir, g.output_filename), 'w') + outfile = open_output_file(g.output_filename) else: usage(1, 'Too many arguments') @@ -562,6 +596,7 @@ if __name__ == "__main__": g.outfile = outfile output = outfile.write + import email msg = email.message_from_file(infile) for header, value in g.set_header_value: