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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/04/08 14:59:29

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

Log message:
        patch #5854

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1224&r2=1.1225
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonOptions.ml?cvsroot=mldonkey&r1=1.204&r2=1.205
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverMain.ml?cvsroot=mldonkey&r1=1.138&r2=1.139

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1224
retrieving revision 1.1225
diff -u -b -r1.1224 -r1.1225
--- distrib/ChangeLog   8 Apr 2007 14:31:43 -0000       1.1224
+++ distrib/ChangeLog   8 Apr 2007 14:59:29 -0000       1.1225
@@ -15,6 +15,7 @@
 =========
 
 2007/04/08
+5854: Set shared_check_files = 0 to disable scanning of shared directories
 5853: New option defaults
 - download_sample_size 100, 10 is too low, download rate is computed wrong
 - EDK-propagate_sources false, this activates outdated MLDonkey-style source

Index: src/daemon/common/commonOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonOptions.ml,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -b -r1.204 -r1.205
--- src/daemon/common/commonOptions.ml  8 Apr 2007 14:31:43 -0000       1.204
+++ src/daemon/common/commonOptions.ml  8 Apr 2007 14:59:29 -0000       1.205
@@ -1270,7 +1270,9 @@
 
 let share_scan_interval = define_option current_section ["share_scan_interval"]
   ~restart: true
-  "How often (in minutes) should MLDonkey scan all shared directories for 
new/removed files"
+  "How often (in minutes) should MLDonkey scan all shared directories for 
new/removed files.
+  0 to disable scanning of shared directories. Use command reshare to manually 
scan shares.
+  When core starts all shared directories are scanned once, independent of 
this option."
     int_option 1
 
 let create_file_mode = define_option current_section ["create_file_mode"]
@@ -1723,7 +1725,7 @@
     if !!min_reask_delay < 600 then min_reask_delay =:= 600
   );
   option_hook share_scan_interval (fun _ ->
-    if !!share_scan_interval < 1 then share_scan_interval =:= 1
+    if !!share_scan_interval < 0 then share_scan_interval =:= 1
   );
   option_hook global_login (fun _ ->
       let len = String.length !!global_login in

Index: src/daemon/driver/driverMain.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverMain.ml,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -b -r1.138 -r1.139
--- src/daemon/driver/driverMain.ml     17 Mar 2007 18:03:01 -0000      1.138
+++ src/daemon/driver/driverMain.ml     8 Apr 2007 14:59:29 -0000       1.139
@@ -465,6 +465,7 @@
   add_infinite_timer 0.1 CommonUploads.upload_download_timer;
   add_infinite_timer !!buffer_writes_delay (fun _ -> Unix32.flush ());
 
+  if !!share_scan_interval <> 0 then
   add_infinite_timer ((float_of_int !!share_scan_interval) *. 60.)
     (fun _ -> CommonShared.shared_check_files ());
   CommonShared.shared_check_files ();