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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/06/01 01:41:11

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

Log message:
        patch #5153

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.869&tr2=1.870&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonWeb.ml.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml.diff?tr1=1.150&tr2=1.151&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverMain.ml.diff?tr1=1.110&tr2=1.111&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.869 mldonkey/distrib/ChangeLog:1.870
--- mldonkey/distrib/ChangeLog:1.869    Thu Jun  1 01:40:28 2006
+++ mldonkey/distrib/ChangeLog  Thu Jun  1 01:41:11 2006
@@ -15,6 +15,7 @@
 =========
 
 2006/06/01
+5153: New command: force_web_infos to manually download web_infos URLs
 5152: Do not connect friends from disabled networks
 5151: Options: New stringvalue functions needed for multiuser support
 5150: Log: Fix log when server list is empty in check_blocked_servers
Index: mldonkey/src/daemon/common/commonWeb.ml
diff -u mldonkey/src/daemon/common/commonWeb.ml:1.31 
mldonkey/src/daemon/common/commonWeb.ml:1.32
--- mldonkey/src/daemon/common/commonWeb.ml:1.31        Sun May 14 19:09:21 2006
+++ mldonkey/src/daemon/common/commonWeb.ml     Thu Jun  1 01:41:11 2006
@@ -153,9 +153,9 @@
 (*                                                                       *)
 (*************************************************************************)
 
-let load_web_infos core_start =
+let load_web_infos core_start force =
   List.iter (fun (kind, period, url) ->
-    if (core_start && period = 0) || (period <> 0 && !hours mod period = 0) 
then
+    if (core_start && period = 0) || (period <> 0 && !hours mod period = 0) || 
force then
       begin
         try
           load_url false kind url
Index: mldonkey/src/daemon/driver/driverCommands.ml
diff -u mldonkey/src/daemon/driver/driverCommands.ml:1.150 
mldonkey/src/daemon/driver/driverCommands.ml:1.151
--- mldonkey/src/daemon/driver/driverCommands.ml:1.150  Thu Jun  1 01:40:28 2006
+++ mldonkey/src/daemon/driver/driverCommands.ml        Thu Jun  1 01:41:11 2006
@@ -341,6 +341,11 @@
             "URL does not exists in web_infos"
     ), "<url> :\t\t\tremove URL from web_infos";
 
+    "force_web_infos", Arg_none (fun o ->
+       CommonWeb.load_web_infos false true;
+        "downloading all web_infos URLs"
+    ), ":\t\t\t\tforce downloading all web_infos URLs";
+
     "recover_temp", Arg_none (fun o ->
         networks_iter (fun r ->
             try
Index: mldonkey/src/daemon/driver/driverMain.ml
diff -u mldonkey/src/daemon/driver/driverMain.ml:1.110 
mldonkey/src/daemon/driver/driverMain.ml:1.111
--- mldonkey/src/daemon/driver/driverMain.ml:1.110      Thu May 25 19:47:25 2006
+++ mldonkey/src/daemon/driver/driverMain.ml    Thu Jun  1 01:41:11 2006
@@ -80,7 +80,7 @@
 
 let hourly_timer timer =
   incr CommonWeb.hours;
-  CommonWeb.load_web_infos false;
+  CommonWeb.load_web_infos false false;
   if !CommonWeb.hours mod !!compaction_delay = 0 then Gc.compact ();
   if !!backup_options_delay <> 0
      && !CommonWeb.hours mod !!backup_options_delay = 0 then
@@ -500,7 +500,7 @@
   Options.prune_file downloads_ini;
   Options.prune_file users_ini;
 (*  Options.prune_file downloads_expert_ini; *)
-  add_timer 5. (fun _ -> try CommonWeb.load_web_infos true with _ -> ());
+  add_timer 5. (fun _ -> try CommonWeb.load_web_infos true false with _ -> ());
   lprintf_nl  (_b "To command: telnet %s %d")
        (if !!telnet_bind_addr = Ip.any then "127.0.0.1"
                else Ip.to_string !!telnet_bind_addr)  !!telnet_port;