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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       12/06/24 08:08:11

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

Log message:
        patch #7803

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1558&r2=1.1559
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.264&r2=1.265

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1558
retrieving revision 1.1559
diff -u -b -r1.1558 -r1.1559
--- distrib/ChangeLog   24 Jun 2012 08:07:07 -0000      1.1558
+++ distrib/ChangeLog   24 Jun 2012 08:08:11 -0000      1.1559
@@ -15,6 +15,7 @@
 =========
 
 2012/06/24
+7803: pause conditions: "pause where priority < X" (ygrek)
 7802: Do not leave empty files if code generation fails (ygrek)
 7801: HTML: Fix content-type for 401 error (ygrek)
 7800: Improve error message visibility (ygrek)

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -b -r1.264 -r1.265
--- src/daemon/driver/driverCommands.ml 7 May 2011 18:59:56 -0000       1.264
+++ src/daemon/driver/driverCommands.ml 24 Jun 2012 08:08:11 -0000      1.265
@@ -3136,18 +3136,23 @@
     ), "<num> :\t\t\tverify chunks of file <num>";
 
     "pause", Arg_multiple (fun args o ->
-        if args = ["all"] && user2_is_admin o.conn_user.ui_user then
-          List.iter (fun file ->
-              file_pause file (admin_user ())
-          ) !!files
-        else
-          List.iter (fun num ->
-              let num = int_of_string num in
-              List.iter (fun file ->
-                  if (as_file_impl file).impl_file_num = num then
+      let filter = 
+        match args with (* TODO richer condition language *)
+        | ["where";"priority";(">"|"<" as op);n] ->
+          let n = int_of_string n in
+          let op = if op = ">" then (>) else (<) in
+          (fun file -> op (file_priority file) n)
+        | ["all"] -> (fun _ -> true)
+        | l ->
+          let l = List.map int_of_string l in
+          (fun file -> List.mem (file_num file) l)
+      in
+      List.iter begin fun file ->
+        if filter file then
                       file_pause file o.conn_user.ui_user
-              ) !!files) args; ""
-    ), "<num|all> :\t\t\tpause a download (use arg 'all' for all files)";
+      end !!files;
+      ""
+    ), "<num|all|where priority < prio> :\t\t\tpause a download (use arg 'all' 
for all files)";
 
     resume_alias "resume";
     resume_alias "unpause";