X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=mimedecode.py;h=6ed2560c6d70ee7aca823fbfc6e01664d58ae711;hb=eee83ff25c87ab0f7abb8b77637f8b24a509250b;hp=c36e40aa48d273acd39a081cd7f4ac93b6214068;hpb=db0cd67905f741dcf93af7706c282afadf051718;p=mimedecode.git

diff --git a/mimedecode.py b/mimedecode.py
index c36e40a..6ed2560 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 header1[,h2,...]|*[,-h1,...]] [-p header1[,h2,h3,...]:param1[,p2,p3,...]] [-r header1[,h2,...]|*[,-h1,...]] [-R header:param] [--remove-params=header] [-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 header1[,h2,...]|*[,-h1,...]] [-R header1[,h2,h3,...]:param1[,p2,p3,...]] [--set-header header:value] [-beit mask] [-o output_file] [input_file [output_file]]
 """ % me)
     if errormsg:
         sys.stderr.write(errormsg + '\n')
@@ -108,6 +108,27 @@ def _decode_headers_params(msg, header, decode_all_params, param_list):
         for param in param_list:
             decode_header_param(msg, header, param)
 
+def _remove_headers_params(msg, header, remove_all_params, param_list):
+    if remove_all_params:
+        params = msg.get_params(header=header)
+        if params:
+            if param_list:
+                for param, value in params:
+                    if param not in param_list:
+                        msg.del_param(param, header)
+            else:
+                value = msg[header]
+                if value is None: # No such header
+                    return
+                if ';' not in value: # There are no parameters
+                    return
+                del msg[header] # Delete all such headers
+                # Get the value without parameters and set it back
+                msg[header] = value.split(';')[0].strip()
+    else:
+        for param in param_list:
+            msg.del_param(param, header)
+
 def decode_headers(msg):
     "Decode message headers according to global options"
 
@@ -122,18 +143,20 @@ def decode_headers(msg):
             for header in header_list:
                 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, param_list in gopts.remove_headers_params:
+        header_list = header_list.split(',')
+        param_list = param_list.split(',')
+        remove_all_params = param_list[0] == '*' # Remove all params except listed
+        if remove_all_params:
+            param_list = _get_exceptions(param_list)
+        if header_list[0] == '*': # Remove for all headers except listed
+            header_list = _get_exceptions(header_list)
+            for header in msg.keys():
+                if header.lower() not in header_list:
+                    _remove_headers_params(msg, header, remove_all_params, param_list)
+        else: # Decode for listed headers
+            for header in header_list:
+                _remove_headers_params(msg, header, remove_all_params, param_list)
 
     for header_list in gopts.decode_headers:
         header_list = header_list.split(',')
@@ -342,9 +365,12 @@ 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 = []
+    remove_headers_params = []
+
+    # A list of header/value pairs to set
+    set_header_value = []
+    # A list of header/parameter/value triples to set
+    #set_header_param = []
 
     totext_mask = [] # A list of content-types to decode
     binary_mask = [] # A list to pass through
@@ -363,7 +389,7 @@ def get_opt():
     try:
         options, arguments = getopt(sys.argv[1:],
             'hVcCDPH:f:d:p:r:R:b:e:i:t:o:',
-            ['help', 'version', 'host=', 'remove-params='])
+            ['help', 'version', 'host=', 'set-header='])
     except GetoptError:
         usage(1)
 
@@ -393,9 +419,9 @@ def get_opt():
         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)
+            gopts.remove_headers_params.append(value.split(':', 1))
+        elif option == '--set-header':
+            gopts.set_header_value.append(value.split(':', 1))
         elif option == '-t':
             gopts.totext_mask.append(value)
         elif option == '-b':
@@ -461,8 +487,13 @@ if __name__ == "__main__":
     gopts.outfile = outfile
     output = outfile.write
 
+    msg = email.message_from_file(infile)
+
+    for header, value in gopts.set_header_value:
+        msg[header] = value
+
     try:
-        decode_message(email.message_from_file(infile))
+        decode_message(msg)
     finally:
         infile.close()
         outfile.close()