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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       11/05/07 18:59:56

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonMessages.ml 
        src/daemon/driver: driverCommands.ml driverControlers.ml 
        src/networks/bittorrent: bTInteractive.ml 

Log message:
        patch #7541

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1529&r2=1.1530
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonMessages.ml?cvsroot=mldonkey&r1=1.75&r2=1.76
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.263&r2=1.264
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverControlers.ml?cvsroot=mldonkey&r1=1.118&r2=1.119
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTInteractive.ml?cvsroot=mldonkey&r1=1.165&r2=1.166

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1529
retrieving revision 1.1530
diff -u -b -r1.1529 -r1.1530
--- distrib/ChangeLog   7 May 2011 18:40:00 -0000       1.1529
+++ distrib/ChangeLog   7 May 2011 18:59:56 -0000       1.1530
@@ -15,6 +15,9 @@
 =========
 
 2011/05/07
+7541: BT: better UI for subfile selection (ygrek)
+- remove debug prefix from set_subfile_prio command
+- do not reload page when toggling subfiles (ajax)
 7540: CryptoPP: Fix compile error with g++ 4.6 (glondu)
 - fixes Debian bug 625051
 

Index: src/daemon/common/commonMessages.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonMessages.ml,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- src/daemon/common/commonMessages.ml 10 Mar 2011 19:24:53 -0000      1.75
+++ src/daemon/common/commonMessages.ml 7 May 2011 18:59:56 -0000       1.76
@@ -621,6 +621,32 @@
     obj.className = obj.className.replace(/\\bchanged\\b/,'');
 }
 
+function xhr_ok_handler(f) {
+ return function() {
+// alert(this.readyState);
+   if (this.readyState != 4) return;
+   if (this.status == 200) { f(this.responseText); }
+ }
+}
+
+function xhr_get(url,f) {
+var client = new XMLHttpRequest();
+client.onreadystatechange = xhr_ok_handler(f);
+client.open(\"GET\", url);
+client.send();
+}
+
+function toggle_priority(o,file,sub)
+{
+  return function(prio) {
+    var p = \"0\";
+    if (prio == \"0\") p = \"1\";
+    o.onclick = function() {
+      xhr_get(\"submit?api=set_subfile_prio+\"+file+\"+\"+p+\"+\"+sub, 
toggle_priority(o,file,sub)); };
+    o.innerText = \"priority \"+prio;
+  }
+}
+
 //-->
   "
 

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -b -r1.263 -r1.264
--- src/daemon/driver/driverCommands.ml 10 Mar 2011 19:24:53 -0000      1.263
+++ src/daemon/driver/driverCommands.ml 7 May 2011 18:59:56 -0000       1.264
@@ -3924,9 +3924,8 @@
            "";
     ), ":\t\t\t\t\tget file block priorities for a file, and show subfile 
completion status";
 
-    "debug_set_subfile_prio", Arg_multiple 
+    "set_subfile_prio", Arg_multiple 
       (fun args o ->
-        let buf = o.conn_buf in
         match args with
         | filenum :: priochar :: subfilestart :: q ->
             let filenum = int_of_string filenum in
@@ -3951,14 +3950,16 @@
               subfile_pos subfile2 ++ subfile_len subfile2 
 (*                 -- if subfile_len subfile2 > 0L then 1L else 0L  *)
             in
+(*
             Printf.bprintf buf "file %s\nstart %Ld stop %Ld prio %u\n" 
               swarmer.CommonSwarming.s_filename start stop priochar;
+*)
             CommonSwarming.swarmer_set_interval swarmer (start,stop,priochar);
             (* show file *)
-            execute_command !CommonNetwork.network_commands o "vd" 
[string_of_int filenum];
-            ""
+(*             execute_command !CommonNetwork.network_commands o "vd" 
[string_of_int filenum]; *)
+            string_of_int priochar
         | _ -> bad_number_of_args "" ""
-    ), "debug_set_subfile_prio <download id> <prio> <1st subfile> <optional 
last subfile>";
+    ), "set_subfile_prio <download id> <prio> <1st subfile (0-based)> 
<optional last subfile>";
 
     "reload_messages", Arg_none (fun o ->
         CommonMessages.load_message_file ();

Index: src/daemon/driver/driverControlers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverControlers.ml,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- src/daemon/driver/driverControlers.ml       7 Nov 2010 15:10:59 -0000       
1.118
+++ src/daemon/driver/driverControlers.ml       7 May 2011 18:59:56 -0000       
1.119
@@ -1402,6 +1402,11 @@
                   html_open_page buf t r true;
                   send_custom_query o.conn_user buf query args
 
+              | [ ("api", cmd) ] ->
+                  clear_page o.conn_buf;
+                  eval (ref true) cmd o;
+                  Buffer.add_string buf (Buffer.contents o.conn_buf)
+
               | [ "setoption", _ ; "option", name; "value", value ] ->
                   html_open_page buf t r true;
                   let gui_type, ip, port =

Index: src/networks/bittorrent/bTInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -b -r1.165 -r1.166
--- src/networks/bittorrent/bTInteractive.ml    31 Jan 2011 17:17:06 -0000      
1.165
+++ src/networks/bittorrent/bTInteractive.ml    7 May 2011 18:59:56 -0000       
1.166
@@ -409,7 +409,7 @@
     with
     | None -> ""
     | Some dl ->
-      Printf.sprintf ", \\<a title=\\\"toggle all files\\\" 
href=\\\"submit?q=debug_set_subfile_prio+%d+%d+%d+%d\\\"\\>%s\\</a\\>"
+      Printf.sprintf ", \\<a title=\\\"toggle all files\\\" 
href=\\\"submit?q=set_subfile_prio+%d+%d+%d+%d\\\"\\>%s\\</a\\>"
         (file_num file) (if dl then 0 else 1) 0 (List.length subfiles - 1)
         (if dl then "unselect all" else "select all")
   in
@@ -421,7 +421,7 @@
     let fs = Printf.sprintf (_b"File %d") !cntr in
     let extra = match prio with
       | None -> ""
-      | Some prio -> Printf.sprintf ", \\<a title=\\\"toggle file\\\" 
href=\\\"submit?q=debug_set_subfile_prio+%d+%d+%d\\\"\\>priority %d\\</a\\>" 
(file_num file) (if prio = 0 then 1 else 0) !cntr prio
+      | Some prio -> Printf.sprintf ", \\<a title=\\\"toggle file\\\" 
href=\\\"javascript:void(0)\\\" 
onclick=\\\"xhr_get('submit?api=set_subfile_prio+%d+%d+%d',toggle_priority(this,%d,%d))\\\"\\>priority
 %d\\</a\\>" (file_num file) (if prio = 0 then 1 else 0) !cntr (file_num file) 
!cntr prio
     in
     emit (fs^extra) ~desc:fs (Printf.sprintf "%s (%Ld bytes%s)%s" filename 
size progress magic);
     incr cntr;