Change option -p to accept lists

Change option -p to accept lists of headers and parameters:
-p h1,h2,h3,..:p1,p2,p3,..

diff --git a/ANNOUNCE b/ANNOUNCE
index 662f947bf6e4f957ba6b9cc878d7e168c87323e7..23d113c95ad0ed0f11b1b7b3c9ac7c5ba9bf95e2 100644 (file)
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -31,6 +31,9 @@ WHAT'S NEW in version 2.4.0 (2014-03-??)
    Change option -d to decode all headers and accept a list of exceptions:
 -d *,-h1,-h2,...
 
+   Change option -p to accept lists of headers and parameters:
+-p h1,h2,h3,..:p1,p2,p3,..
+
    Add ChangeLog.
 
 WHAT'S NEW in version 2.3.8 (2014-02-26)

diff --git a/TODO b/TODO
index 4428a0a4c033a524cc7095237231d29746adfade..da13a02ef28cdd05db98de44a08739d2247f6db4 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,6 +1,4 @@
-Change option -p to accept lists of headers and parameters:
--p h1,h2,h3:p1,p2,p3
-Allow * and exceptions:
+Allow * and exceptions for -p:
 -p h1,h2,h3:*,-p1,-p2,-p3
 -p *,-h1,-h2,-h3:p1,p2,p3
 -p *,-h1,-h2,-h3:*,-p1,-p2,-p3

diff --git a/mimedecode.docbook b/mimedecode.docbook
index 4cbd688f4535900ad77716890ed4f7920b17da75..d98db683691271f016f08df8cfedd248c961c106 100644 (file)
--- a/mimedecode.docbook
+++ b/mimedecode.docbook
@@ -54,7 +54,7 @@
          <option>-d *[,-header1,-header2,-header3...]</option>
       </arg>
       <arg choice="opt">
-         <option>-p header:param</option>
+        <option>-p header1[,header2,header3,...]:param1[,param2,param3,...]</option>
       </arg>
       <arg choice="opt">
          <option>-r header</option>
@@ -137,6 +137,13 @@
 </para>
 </refsect1>
 
+<refsect1>
+  <para>
+    Please be warned that in the following options asterisk is a shell
+    metacharacter and should be escaped or quoted. Either write -d \*,-h1,-h2
+    or -d '*,-h1,-h2' or such.
+  </para>
+</refsect1>
 
 <refsect1>
 <title>OPTIONS</title>
@@ -222,12 +229,6 @@
            this mode it would be meaningless to give more than one -d options
            but the program doesn't enforce it.
          </para>
-
-         <para>
-           Please be warned that the asterisk is a shell metacharacter and
-           should be escaped or quoted. Either write -d \*,-h1,-h2 or -d
-           '*,-h1,-h2'.
-         </para>
       </listitem>
    </varlistentry>
 
@@ -241,13 +242,13 @@
    </varlistentry>
 
    <varlistentry>
-      <term>-p header:param</term>
+      <term>-p header1[,header2,header3,...]:param1[,param2,param3,...]</term>
       <listitem>
          <para>
-            Add the pair (header, param) to a list of headers parameters to
-            decode; initially the list contains header "Content-Type",
-            parameter "name" and header "Content-Disposition", parameter
-            "filename".
+            Add the parameters(s) to a list of headers parameters to decode;
+            the parameters will be decoded only for the given header(s).
+            Initially the list contains header "Content-Type", parameter "name";
+            and header "Content-Disposition", parameter "filename".
          </para>
       </listitem>
    </varlistentry>

diff --git a/mimedecode.py b/mimedecode.py
index 23493d40e4ed1a370cd800d2e6dbdb829af88d03..0e01572b67af7d4da6d55cb18aea41c6cd22c9a5 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 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')
@@ -124,8 +124,12 @@ def decode_headers(msg):
             for header in header_list:
                 decode_header(msg, header)
 
-    for header, param in gopts.decode_header_params:
-        decode_header_param(msg, header, param)
+    for header_list, param_list in gopts.decode_header_params:
+        header_list = header_list.split(',')
+        param_list = param_list.split(',')
+        for header in header_list:
+            for param in param_list:
+                decode_header_param(msg, header, param)
 
 
 def set_header(msg, header, value):

diff --git a/test/test_all b/test/test_all
index 25f8183fe310040d1ca151312c90774cbb9617ea..f61c63a9ddc74f99e44fcff99f41f713fab5bf80 100755 (executable)
--- a/test/test_all
+++ b/test/test_all
@@ -47,6 +47,7 @@ test_file msg_15.txt msg_15-2.txt -i text/html
 test_file msg_22.txt msg_22-1.txt -r content-id
 test_file msg_29.txt msg_29-1.txt -R Content-Type:title
 test_file msg_18.txt msg_18-1.txt --remove-params=X-Foobar-Spoink-Defrobnit
+test_file msg_22.txt msg_22.txt -P -p Content-Type,Content-Disposition:name,filename
 
 if [ "$RC" -eq 0 ]; then
    echo "All tests passed!"