[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/03/04 21:26:36

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonInteractive.ml commonNetwork.ml 
                           commonNetwork.mli commonStats.ml 
                           commonTypes.ml 
        src/daemon/driver: driverCommands.ml driverInteractive.ml 
        src/networks/bittorrent: bTStats.ml 
        src/networks/donkey: donkeyStats.ml 

Log message:
        patch #5782

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1191&r2=1.1192
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonInteractive.ml?cvsroot=mldonkey&r1=1.91&r2=1.92
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonNetwork.ml?cvsroot=mldonkey&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonNetwork.mli?cvsroot=mldonkey&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonStats.ml?cvsroot=mldonkey&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonTypes.ml?cvsroot=mldonkey&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.220&r2=1.221
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverInteractive.ml?cvsroot=mldonkey&r1=1.127&r2=1.128
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTStats.ml?cvsroot=mldonkey&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyStats.ml?cvsroot=mldonkey&r1=1.26&r2=1.27

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1191
retrieving revision 1.1192
diff -u -b -r1.1191 -r1.1192
--- distrib/ChangeLog   28 Feb 2007 22:57:17 -0000      1.1191
+++ distrib/ChangeLog   4 Mar 2007 21:26:35 -0000       1.1192
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2007/03/04
+5782: Improve CommonNetwork.network_display_stats function
+
 2007/02/28
 5757: Some improvements for byte-code build
 - "make utils" now builds byte-code if needed

Index: src/daemon/common/commonInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonInteractive.ml,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- src/daemon/common/commonInteractive.ml      18 Feb 2007 00:22:47 -0000      
1.91
+++ src/daemon/common/commonInteractive.ml      4 Mar 2007 21:26:35 -0000       
1.92
@@ -548,11 +548,11 @@
 let network_must_update n =
    CommonEvent.add_event (Network_info_event n)
 
-let network_display_stats buf o =
+let network_display_stats o =
   networks_iter_all (fun r ->
     try
       if List.mem NetworkHasStats r.network_flags then
-        network_display_stats r buf o
+        network_display_stats r o
     with _ -> ())
 
 let print_connected_servers o =

Index: src/daemon/common/commonNetwork.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonNetwork.ml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- src/daemon/common/commonNetwork.ml  26 Nov 2006 13:54:09 -0000      1.33
+++ src/daemon/common/commonNetwork.ml  4 Mar 2007 21:26:35 -0000       1.34
@@ -249,7 +249,7 @@
   let url = try Url.decode url with _ -> url in
   n.op_network_parse_url url
     
-let network_display_stats n buf o = n.op_network_display_stats buf o
+let network_display_stats n o = n.op_network_display_stats o
 let network_info n = n.op_network_info ()
 let network_stat_info_list n = n.op_network_stat_info_list ()
 let network_gui_message n s u = n.op_network_gui_message s u
@@ -290,7 +290,7 @@
       op_network_add_server = (fun _ -> fni name "op_network_add_server");
       op_network_gui_message = (fun _ _ -> ni_ok name "gui_message");
       op_network_download = (fun _ _ -> fni name "network_download");
-      op_network_display_stats = (fun _ _ -> ni_ok name "display_stats");
+      op_network_display_stats = (fun _ -> ni_ok name "display_stats");
       op_network_stat_info_list = (fun _ -> []);
       op_network_clean_exit = (fun _ -> true);
       op_network_reset = (fun _ -> ni_ok name "reset");

Index: src/daemon/common/commonNetwork.mli
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonNetwork.mli,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- src/daemon/common/commonNetwork.mli 26 Nov 2006 13:54:09 -0000      1.19
+++ src/daemon/common/commonNetwork.mli 4 Mar 2007 21:26:35 -0000       1.20
@@ -212,10 +212,9 @@
 (** call the op_network_display_stats method of a network.
     Output statistics about a network
     @param network instance
-    @param output buffer
     @param interface context *)
 val network_display_stats : 
-  CommonTypes.network -> Buffer.t -> CommonTypes.ui_conn -> unit
+  CommonTypes.network -> CommonTypes.ui_conn -> unit
 
 (** call the op_network_info method of a network.
     Return the current status of a network.

Index: src/daemon/common/commonStats.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonStats.ml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/daemon/common/commonStats.ml    23 Sep 2006 20:29:46 -0000      1.4
+++ src/daemon/common/commonStats.ml    4 Mar 2007 21:26:35 -0000       1.5
@@ -216,7 +216,7 @@
 
 let stats_html_header buf =
   html_mods_table_header buf "csTable" "cs" [
-   ( "0", "srh", "BT Client brand", "Brand" );
+   ( "0", "srh", "Client brand", "Brand" );
    ( "0", "srh", "Separator", ":" );
    ( "1", "srh ar", "Successful connections", "Seen" );
    ( "1", "srh", "Successful connections percent", "%" );

Index: src/daemon/common/commonTypes.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonTypes.ml,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- src/daemon/common/commonTypes.ml    6 Jan 2007 18:15:17 -0000       1.66
+++ src/daemon/common/commonTypes.ml    4 Mar 2007 21:26:35 -0000       1.67
@@ -533,7 +533,7 @@
     mutable op_network_gui_message : (string -> userdb -> unit);
     
     mutable op_network_download : (result_info -> userdb -> file);
-    mutable op_network_display_stats : (Buffer.t -> ui_conn -> unit);
+    mutable op_network_display_stats : (ui_conn -> unit);
     mutable op_network_stat_info_list : unit -> (string * int * 
(network_stat_info list)) list;
     mutable op_network_clean_exit : (unit -> bool);
     mutable op_network_reset : (unit -> unit);

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -b -r1.220 -r1.221
--- src/daemon/driver/driverCommands.ml 6 Feb 2007 22:26:58 -0000       1.220
+++ src/daemon/driver/driverCommands.ml 4 Mar 2007 21:26:35 -0000       1.221
@@ -1119,32 +1119,29 @@
     ), ":\t\t\t\ttoggle between the two rate sets";
 
     "stats", Arg_none (fun o ->
-        let buf = o.conn_buf in
-        CommonInteractive.network_display_stats buf o;
+        CommonInteractive.network_display_stats o;
         if use_html_mods o then
-          print_gdstats buf o;
+          print_gdstats o;
       _s ""), ":\t\t\t\t\tdisplay transfer statistics";
 
     "gdstats", Arg_none (fun o ->
-        let buf = o.conn_buf in
        if Autoconf.has_gd then
           if use_html_mods o then
-            print_gdstats buf o
+            print_gdstats o
           else
-            Printf.bprintf buf "Only available on HTML interface"
+            print_command_result o (_s "Only available on HTML interface")
        else
-         Printf.bprintf buf "Gd support was not compiled";
+          print_command_result o (_s "Gd support was not compiled");
       _s ""), ":\t\t\t\tdisplay graphical transfer statistics";
 
     "gdremove", Arg_none (fun o ->
-        let buf = o.conn_buf in
        if Autoconf.has_gd then
          begin
            DriverGraphics.G.really_remove_files ();
-           Printf.bprintf buf "Gd files were removed"
+            print_command_result o (_s "Gd files were removed")
          end
        else
-         Printf.bprintf buf "Gd support was not compiled";
+          print_command_result o (_s "Gd support was not compiled");
       _s ""), ":\t\t\t\tremove graphical transfer statistics files";
 
     "!", Arg_multiple (fun arg o ->

Index: src/daemon/driver/driverInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- src/daemon/driver/driverInteractive.ml      28 Feb 2007 22:55:16 -0000      
1.127
+++ src/daemon/driver/driverInteractive.ml      4 Mar 2007 21:26:35 -0000       
1.128
@@ -1793,7 +1793,8 @@
           with _ -> ())
     end
 
-let print_gdstats buf o =
+let print_gdstats o =
+  let buf = o.conn_buf in
   let picture_suffix () =
     if !!html_mods_vd_gfx_png then
       Printf.bprintf buf "png\\\"\\>"

Index: src/networks/bittorrent/bTStats.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTStats.ml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/networks/bittorrent/bTStats.ml  2 Dec 2006 12:35:46 -0000       1.9
+++ src/networks/bittorrent/bTStats.ml  4 Mar 2007 21:26:35 -0000       1.10
@@ -93,7 +93,7 @@
         end
 
 let _ =
-  network.op_network_display_stats <- (fun buf o -> print_stats o New);
+  network.op_network_display_stats <- (fun o -> print_stats o New);
 
   network.op_network_stat_info_list <- (fun _ ->
     let l1 = stats_list brand_list stats_array in

Index: src/networks/donkey/donkeyStats.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyStats.ml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- src/networks/donkey/donkeyStats.ml  2 Dec 2006 12:35:46 -0000       1.26
+++ src/networks/donkey/donkeyStats.ml  4 Mar 2007 21:26:35 -0000       1.27
@@ -170,7 +170,7 @@
           end
 
 let _ =
-  network.op_network_display_stats <- (fun buf o -> print_stats o New false);
+  network.op_network_display_stats <- (fun o -> print_stats o New false);
 
   network.op_network_stat_info_list <- (fun _ ->
     let r = ref [] in