Change option -r to accept a list of headers; * is allowed

[mimedecode.git] / mimedecode.py

diff --git a/mimedecode.py b/mimedecode.py
index f3362cf824121c218daf2b8a9833f7281b663705..c36e40aa48d273acd39a081cd7f4ac93b6214068 100755 (executable)
--- 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 header] [-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 header:param] [--remove-params=header] [-beit mask] [-o output_file] [input_file [output_file]]
 """ % me)
     if errormsg:
         sys.stderr.write(errormsg + '\n')
@@ -97,11 +97,30 @@ def decode_header_param(msg, header, param):
 def _get_exceptions(list):
     return [x[1:].lower() for x in list[1:] if x[0]=='-']
 
+def _decode_headers_params(msg, header, decode_all_params, param_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 decode_headers(msg):
     "Decode message headers according to global options"
 
-    for header in gopts.remove_headers:
-        del msg[header]
+    for header_list in gopts.remove_headers:
+        header_list = header_list.split(',')
+        if header_list[0] == '*': # Remove all headers except listed
+            header_list = _get_exceptions(header_list)
+            for header in msg.keys():
+                if header.lower() not in header_list:
+                    del msg[header]
+        else: # Remove listed headers
+            for header in header_list:
+                del msg[header]
 
     for header in gopts.remove_all_params:
         value = msg[header]
@@ -137,26 +156,10 @@ def decode_headers(msg):
             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)
+                    _decode_headers_params(msg, header, decode_all_params, param_list)
         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)
+                _decode_headers_params(msg, header, decode_all_params, param_list)
 
 
 def set_header(msg, header, value):