X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=mimedecode.py;h=f3362cf824121c218daf2b8a9833f7281b663705;hb=0a403f7adfdd3a7fcc019b84affa602e8e934169;hp=8ea6922ff02743f2fa700f770581b6f1738e0999;hpb=da30350f252527689adaa38118e6882adde64df4;p=mimedecode.git

diff --git a/mimedecode.py b/mimedecode.py
index 8ea6922..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] [-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"
 
@@ -113,11 +116,47 @@ def decode_headers(msg):
     for header, param in gopts.remove_header_params:
         msg.del_param(param, header)
 
-    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_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):
@@ -339,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 = []