[Mldonkey-commits] mldonkey distribChangeLog src/networks/bittorre...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/06/16 16:53:19

Modified files:
        distrib        : ChangeLog 
        src/networks/bittorrent: bTMain.ml bTOptions.ml 
        src/utils/cdk  : unix2.ml 

Log message:
        patch #5187

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.891&r2=1.892
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTMain.ml?cvsroot=mldonkey&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTOptions.ml?cvsroot=mldonkey&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/cdk/unix2.ml?cvsroot=mldonkey&r1=1.29&r2=1.30

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.891
retrieving revision 1.892
diff -u -b -r1.891 -r1.892
--- distrib/ChangeLog   16 Jun 2006 16:52:35 -0000      1.891
+++ distrib/ChangeLog   16 Jun 2006 16:53:19 -0000      1.892
@@ -15,6 +15,8 @@
 =========
 
 2006/06/16
+5187: New option: BT_import_new_torrents_interval,
+      ignore Thumbs.db & desktop.ini in directory lists
 5186: GUI: Send only non-empty real_startup_message string
 
 2006/06/15

Index: src/networks/bittorrent/bTMain.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTMain.ml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- src/networks/bittorrent/bTMain.ml   6 Jun 2006 22:31:18 -0000       1.22
+++ src/networks/bittorrent/bTMain.ml   16 Jun 2006 16:53:19 -0000      1.23
@@ -87,7 +87,8 @@
     add_session_timer enabler 300. (fun _ ->
         BTInteractive.share_files ();
     );
-    add_session_timer enabler 10. (fun _ ->
+    if !!import_new_torrents_interval <> 0. then
+    add_session_timer enabler !!import_new_torrents_interval (fun _ ->
         BTInteractive.scan_new_torrents_directory ();
     );
     add_timer 10. BTInteractive.share_files;

Index: src/networks/bittorrent/bTOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTOptions.ml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- src/networks/bittorrent/bTOptions.ml        5 May 2006 22:08:00 -0000       
1.27
+++ src/networks/bittorrent/bTOptions.ml        16 Jun 2006 16:53:19 -0000      
1.28
@@ -97,6 +97,10 @@
     "Number of peers to request from tracker (Negative # = let tracker decide)"
     int_option (-1)
 
+let import_new_torrents_interval = define_option bittorrent_section 
["import_new_torrents_interval"]
+    "Interval in seconds 'torrents/incoming' is scanned for new torrent files 
to be downloaded, 0 to deactivate, changes require restart"
+    float_option 60.
+
 let _ =
   begin
     option_hook max_uploaders_per_torrent

Index: src/utils/cdk/unix2.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/cdk/unix2.ml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- src/utils/cdk/unix2.ml      9 May 2006 11:34:25 -0000       1.29
+++ src/utils/cdk/unix2.ml      16 Jun 2006 16:53:19 -0000      1.30
@@ -60,7 +60,8 @@
       while true do
        let file = readdir dir in 
        if file <> "." && file <> ".." &&
-         not (file = ".DS_Store" || String2.check_prefix file "._") then
+         not (file = ".DS_Store" || String2.check_prefix file "._" ||
+              file = "Thumbs.db" || file = "desktop.ini") then
             list := file :: !list 
       done
     with End_of_file -> ());