Allow * and exceptions for -p in the headers list

[mimedecode.git] / mimedecode.py

diff --git a/mimedecode.py b/mimedecode.py
index 82f2d26108a43317f13ef295635b38850713449d..6d4c7ea8cef6856844935337d0798eff27c61da1 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[,header2,header3...]] [-p header:param] [-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 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,6 +94,9 @@ 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"
 
@@ -114,11 +117,29 @@ def decode_headers(msg):
         msg.del_param(param, header)
 
     for header_list in gopts.decode_headers:
-        for header in header_list.split(','):
-            decode_header(msg, header)
-
-    for header, param in gopts.decode_header_params:
-        decode_header_param(msg, header, param)
+        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(',')
+        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:
+                    for param in param_list:
+                        decode_header_param(msg, header, param)
+        else: # Decode for listed headers
+            for header in header_list:
+                for param in param_list:
+                    decode_header_param(msg, header, param)
 
 
 def set_header(msg, header, value):
@@ -340,6 +361,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 = []