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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       08/02/04 23:58:22

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

Log message:
        patch #6404

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1356&r2=1.1357
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonInteractive.ml?cvsroot=mldonkey&r1=1.103&r2=1.104
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonOptions.ml?cvsroot=mldonkey&r1=1.219&r2=1.220
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.245&r2=1.246

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1356
retrieving revision 1.1357
diff -u -b -r1.1356 -r1.1357
--- distrib/ChangeLog   3 Feb 2008 23:13:19 -0000       1.1356
+++ distrib/ChangeLog   4 Feb 2008 23:58:22 -0000       1.1357
@@ -14,6 +14,10 @@
 ChangeLog
 =========
 
+2008/02/05
+6404: New option release_new_downloads
+- set to true to activate release slot feature for all newly started downloads
+
 2008/02/04
 6080: HTTP interface: new command/button "logout" (Schlumpf)
 6077: bw_toggle: support new option "max_opened_connections_2" (Schlumpf)

Index: src/daemon/common/commonInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonInteractive.ml,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -b -r1.103 -r1.104
--- src/daemon/common/commonInteractive.ml      17 Dec 2007 11:35:56 -0000      
1.103
+++ src/daemon/common/commonInteractive.ml      4 Feb 2008 23:58:22 -0000       
1.104
@@ -524,6 +524,7 @@
 
 let start_download file =
   if !!pause_new_downloads then file_pause file (admin_user ());
+  if !!release_new_downloads then set_file_release file true (admin_user ());
   if !!file_started_cmd <> "" then
     begin
       let info = file_info file in

Index: src/daemon/common/commonOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonOptions.ml,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -b -r1.219 -r1.220
--- src/daemon/common/commonOptions.ml  3 Feb 2008 23:11:23 -0000       1.219
+++ src/daemon/common/commonOptions.ml  4 Feb 2008 23:58:22 -0000       1.220
@@ -617,7 +617,8 @@
     int_option 5
 
 let max_release_slots = define_option current_section ["max_release_slots"]
-  "How many percent of upload slots can be used for downloading files tagged 
as release"
+  "How many percent of upload slots can be used for downloading files
+  tagged as release, maximum 75%"
     percent_option 20
 
 let friends_upload_slot = define_option current_section ["friends_upload_slot"]
@@ -1182,6 +1183,10 @@
   will be set to false on core start."
     bool_option false
 
+let release_new_downloads = define_option current_section 
["release_new_downloads"]
+  "Set to true if you want to activate the release slot feature for all new 
downloads."
+    bool_option false
+
 (*  emulate_sparsefiles does not work, temporarily disabled
 let emulate_sparsefiles = define_expert_option current_section 
["emulate_sparsefiles"]
   "Set to true if you want MLdonkey to emulate sparse files on your disk.
@@ -1747,6 +1752,9 @@
     end;
     calc_real_max_indirect_connections ()
   );
+  option_hook max_release_slots (fun _ ->
+    if !!max_release_slots > 75 then max_release_slots =:= 75
+  );
   option_hook min_reask_delay (fun _ ->
     if !!min_reask_delay < 600 then min_reask_delay =:= 600
   );

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -b -r1.245 -r1.246
--- src/daemon/driver/driverCommands.ml 3 Feb 2008 23:13:20 -0000       1.245
+++ src/daemon/driver/driverCommands.ml 4 Feb 2008 23:58:22 -0000       1.246
@@ -2069,6 +2069,7 @@
                        strings_of_option allow_browse_share;
                        strings_of_option auto_commit;
                        strings_of_option pause_new_downloads;
+                       strings_of_option release_new_downloads;
                        strings_of_option create_file_mode;
                        strings_of_option create_dir_mode;
                        strings_of_option create_file_sparse;