[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       10/04/10 17:06:04

Modified files:
        distrib        : ChangeLog 
        src/daemon/driver: driverControlers.ml 

Log message:
        patch #7162

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1422&r2=1.1423
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverControlers.ml?cvsroot=mldonkey&r1=1.114&r2=1.115

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1422
retrieving revision 1.1423
diff -u -b -r1.1422 -r1.1423
--- distrib/ChangeLog   8 Apr 2010 19:05:09 -0000       1.1422
+++ distrib/ChangeLog   10 Apr 2010 17:06:04 -0000      1.1423
@@ -14,6 +14,11 @@
 ChangeLog
 =========
 
+2010/04/10
+7162: filter longhelp output (ygrek)
+- longhelp (or ??) with parameters will output only those commands that
+  contain all of the specified parameters as substring
+
 2010/04/08
 7161: bw_toggle: Add options "high" and "low"
 - bw_toggle without options works as before

Index: src/daemon/driver/driverControlers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverControlers.ml,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- src/daemon/driver/driverControlers.ml       24 Feb 2009 19:20:53 -0000      
1.114
+++ src/daemon/driver/driverControlers.ml       10 Apr 2010 17:06:04 -0000      
1.115
@@ -112,8 +112,9 @@
     else cmd in
   let l = String2.tokens cmd in
   match l with
-    [] -> ()
-  | ["longhelp"] | ["??"] ->
+  | [] -> ()
+  | "longhelp"::subs | "??"::subs ->
+      let filter cmd = List.for_all (String2.contains cmd) subs in
       let module M = CommonMessages in
       if o.conn_output = HTML then begin
           Buffer.add_string buf "\\<div class=\\\"cs\\\"\\>";
@@ -125,8 +126,8 @@
             ("", "srh", ""); ];
           Buffer.add_string buf "\\</tr\\>";
           html_mods_cntr_init ();
-          List.iter (fun (cmd, _, _, help) ->
-              let ncmd = ref cmd in
+          let show (cmd, _, _, help) =
+              let ncmd = ref cmd in (* why? *)
               let nhelp = ref help in
               Printf.bprintf buf "\\<tr class=\\\"dl-%d\\\"\\>" 
(html_mods_cntr ());
               html_mods_td buf [
@@ -136,9 +137,10 @@
                 ("", "sr", "\\<a href=\\\"http://mldonkey.sourceforge.net/"; ^ 
(String2.upp_initial !ncmd) ^
                   "\\\"\\>wiki\\</a\\>"); ];
               Printf.bprintf buf "\\</tr\\>\n";
-          )
+          in
+          List.iter show 
           (List.sort (fun (c1,_, _,_) (c2,_, _,_) -> compare c1 c2)
-            !CommonNetwork.network_commands);
+              (List.filter (fun (c,_,_,_) -> filter c) 
!CommonNetwork.network_commands));
           Printf.bprintf buf "\\</table\\>\\</div\\>";
           html_mods_table_header buf "helpTable" "results" [];
           Printf.bprintf buf "\\<tr class=\\\"dl-1\\\"\\>";
@@ -153,11 +155,11 @@
           let list = Hashtbl2.to_list2 commands_by_kind in
           let list = List.sort (fun (s1,_) (s2,_) -> compare s1 s2) list in
           List.iter (fun (s,list) ->
+              match List.sort (fun (s1,_) (s2,_) -> compare s1 s2) 
(List.filter (fun (s,_) -> filter s) !list) with
+              | [] -> ()
+              | list ->
               Printf.bprintf buf "\n   $b%s$n:\n" s;
-              let list = List.sort (fun (s1,_) (s2,_) -> compare s1 s2) !list 
in
-              List.iter (fun (cmd, help) ->
-                  Printf.bprintf buf "$r%s$n %s\n" cmd help;
-              ) list
+                List.iter (fun (cmd, help) -> Printf.bprintf buf "$r%s$n %s\n" 
cmd help) list
           ) list;
         end
 
@@ -251,7 +253,7 @@
                html_mods_td buf [
                  ("", "sr", "Use '$r\\<a href=\\\"submit?q=longhelp\\\"\\>" ^
                    "longhelp\\</a\\>$n' or '$r\\<a 
href=\\\"submit?q=longhelp\\\"\\>" ^
-                   "??\\</a\\>$n' for all commands."); ];
+                   "??\\</a\\>$n' for all commands. Specify substring to 
filter."); ];
                Buffer.add_string buf "\\</tr\\>\\<tr class=\\\"dl-1\\\"\\>";
                html_mods_td buf [
                  ("", "sr", "Use '$rhelp command$n' or '$r? command$n' for 
help on a command."); ];
@@ -283,6 +285,7 @@
           $rq$n : quit this interface
 
 Use '$rlonghelp$n' or '$r??$n' for all commands.
+Use '$rlonghelp str$n' or '$r?? str$n' for all commands that contain specified 
substring.
 Use '$rhelp command$n' or '$r? command$n' for help on a command.
             ";
     | "?" :: args | "help" :: args | "man" :: args ->