X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=mimedecode.py;h=f3362cf824121c218daf2b8a9833f7281b663705;hb=0a403f7adfdd3a7fcc019b84affa602e8e934169;hp=c3e3ecffc13fba23137cdc8c955ab2bffe0f861b;hpb=93b627c389e98f0ef7347035ee75a8603b6dd866;p=mimedecode.git

diff --git a/mimedecode.py b/mimedecode.py
index c3e3ecf..f3362cf 100755
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -18,7 +18,7 @@ Broytman mimedecode.py version %s, %s
 def usage(code=0, errormsg=''):
     version(0)
     sys.stdout.write("""\
-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]]
+Usage: %s [-h|--help] [-V|--version] [-cCDP] [-H|--host=hostname] [-f charset] [-d header1[,h2,...]|*[,-h1,...]] [-p header1[,h2,h3,...]:param1[,p2,p3,...]] [-r header] [-R header:param] [--remove-params=header] [-beit mask] [-o output_file] [input_file [output_file]]
 """ % me)
     if errormsg:
         sys.stderr.write(errormsg + '\n')
@@ -94,18 +94,70 @@ def decode_header_param(msg, header, param):
                 msg.set_param(param, new_value, header)
 
 
+def _get_exceptions(list):
+    return [x[1:].lower() for x in list[1:] if x[0]=='-']
+
 def decode_headers(msg):
     "Decode message headers according to global options"
 
-    for header in gopts.decode_headers:
-        decode_header(msg, header)
-
-    for header, param in gopts.decode_header_params:
-        decode_header_param(msg, header, param)
-
     for header in gopts.remove_headers:
         del msg[header]
 
+    for header in gopts.remove_all_params:
+        value = msg[header]
+        if value is None: # No such header
+            continue
+        if ';' not in value: # There are no parameters
+            continue
+        del msg[header] # Delete all such headers
+        # Get the value without parameters and set it back
+        msg[header] = value.split(';')[0].strip()
+
+    for header, param in gopts.remove_header_params:
+        msg.del_param(param, header)
+
+    for header_list in gopts.decode_headers:
+        header_list = header_list.split(',')
+        if header_list[0] == '*': # Decode all headers except listed
+            header_list = _get_exceptions(header_list)
+            for header in msg.keys():
+                if header.lower() not in header_list:
+                    decode_header(msg, header)
+        else: # Decode listed headers
+            for header in header_list:
+                decode_header(msg, header)
+
+    for header_list, param_list in gopts.decode_header_params:
+        header_list = header_list.split(',')
+        param_list = param_list.split(',')
+        decode_all_params = param_list[0] == '*' # Decode all params except listed
+        if decode_all_params:
+            param_list = _get_exceptions(param_list)
+        if header_list[0] == '*': # Decode for all headers except listed
+            header_list = _get_exceptions(header_list)
+            for header in msg.keys():
+                if header.lower() not in header_list:
+                    if decode_all_params:
+                        params = msg.get_params(header=header)
+                        if params:
+                            for param, value in params:
+                                if param not in param_list:
+                                    decode_header_param(msg, header, param)
+                    else:
+                        for param in param_list:
+                            decode_header_param(msg, header, param)
+        else: # Decode for listed headers
+            for header in header_list:
+                if decode_all_params:
+                    params = msg.get_params(header=header)
+                    if params:
+                        for param, value in params:
+                            if param not in param_list:
+                                decode_header_param(msg, header, param)
+                else:
+                    for param in param_list:
+                        decode_header_param(msg, header, param)
+
 
 def set_header(msg, header, value):
     "Replace header"
@@ -278,7 +330,7 @@ class GlobalOptions:
     decode_headers = ["From", "To", "Cc", "Reply-To", "Mail-Followup-To",
                       "Subject"]
 
-    # A list of headers' parameters to decode
+    # A list of headers parameters to decode
     decode_header_params = [
         ("Content-Type", "name"),
         ("Content-Disposition", "filename"),
@@ -286,6 +338,10 @@ class GlobalOptions:
 
     # A list of headers to remove
     remove_headers = []
+    # A list of headers parameters to remove
+    remove_header_params = []
+    # A list of headers to be stripped of all parameters
+    remove_all_params = []
 
     totext_mask = [] # A list of content-types to decode
     binary_mask = [] # A list to pass through
@@ -302,8 +358,9 @@ def get_opt():
     from getopt import getopt, GetoptError
 
     try:
-        options, arguments = getopt(sys.argv[1:], 'hVcCDPH:f:d:p:r:b:e:i:t:o:',
-            ['help', 'version', 'host'])
+        options, arguments = getopt(sys.argv[1:],
+            'hVcCDPH:f:d:p:r:R:b:e:i:t:o:',
+            ['help', 'version', 'host=', 'remove-params='])
     except GetoptError:
         usage(1)
 
@@ -321,6 +378,8 @@ def get_opt():
         elif option == '-f':
             gopts.default_encoding = value
         elif option == '-d':
+            if value.startswith('*'):
+                gopts.decode_headers = []
             gopts.decode_headers.append(value)
         elif option == '-D':
             gopts.decode_headers = []
@@ -330,6 +389,10 @@ def get_opt():
             gopts.decode_header_params = []
         elif option == '-r':
             gopts.remove_headers.append(value)
+        elif option == '-R':
+            gopts.remove_header_params.append(value.split(':', 1))
+        elif option == '--remove-params':
+            gopts.remove_all_params.append(value)
         elif option == '-t':
             gopts.totext_mask.append(value)
         elif option == '-b':