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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/05/14 19:09:21

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonWeb.ml 
        src/networks/bittorrent: bTClients.ml bTInteractive.ml 
        src/networks/donkey: donkeyInteractive.ml 
        src/networks/gnutella: gnutellaRedirector.ml 
        src/utils/net  : http_client.ml http_client.mli 

Log message:
        patch #5094

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.825&tr2=1.826&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonWeb.ml.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTClients.ml.diff?tr1=1.68&tr2=1.69&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml.diff?tr1=1.89&tr2=1.90&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyInteractive.ml.diff?tr1=1.103&tr2=1.104&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/gnutella/gnutellaRedirector.ml.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/net/http_client.ml.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/net/http_client.mli.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.825 mldonkey/distrib/ChangeLog:1.826
--- mldonkey/distrib/ChangeLog:1.825    Sun May 14 18:54:17 2006
+++ mldonkey/distrib/ChangeLog  Sun May 14 19:09:21 2006
@@ -15,6 +15,7 @@
 =========
 
 2006/05/14
+5094: Wget: New internal variable req_save <bool>
 5093: CommonSwarming: Verbose error message if file size does not match
 5092: HTML, rss: Add startbt link
 5091: HTML: update EDK history links
Index: mldonkey/src/daemon/common/commonWeb.ml
diff -u mldonkey/src/daemon/common/commonWeb.ml:1.30 
mldonkey/src/daemon/common/commonWeb.ml:1.31
--- mldonkey/src/daemon/common/commonWeb.ml:1.30        Fri May  5 22:08:00 2006
+++ mldonkey/src/daemon/common/commonWeb.ml     Sun May 14 19:09:21 2006
@@ -70,6 +70,7 @@
       with Not_found -> []);
       H.req_user_agent = get_user_agent ();
       H.req_max_retry = 20;
+      H.req_save = true;
     } in
     let r1 = {
       r with
Index: mldonkey/src/networks/bittorrent/bTClients.ml
diff -u mldonkey/src/networks/bittorrent/bTClients.ml:1.68 
mldonkey/src/networks/bittorrent/bTClients.ml:1.69
--- mldonkey/src/networks/bittorrent/bTClients.ml:1.68  Fri May  5 22:02:37 2006
+++ mldonkey/src/networks/bittorrent/bTClients.ml       Sun May 14 19:09:21 2006
@@ -203,8 +203,7 @@
                 (fun fileres ->
                   t.tracker_last_conn <- last_time ();
                   file.file_tracker_connected <- true;
-                  f t fileres;
-                 (try Sys.remove fileres with _ -> ()))
+                  f t fileres)
           end
         end
 
Index: mldonkey/src/networks/bittorrent/bTInteractive.ml
diff -u mldonkey/src/networks/bittorrent/bTInteractive.ml:1.89 
mldonkey/src/networks/bittorrent/bTInteractive.ml:1.90
--- mldonkey/src/networks/bittorrent/bTInteractive.ml:1.89      Fri May 12 
21:08:30 2006
+++ mldonkey/src/networks/bittorrent/bTInteractive.ml   Sun May 14 19:09:21 2006
@@ -664,8 +664,7 @@
           lprintf_nl () "done...";
       if ft_state ft = FileDownloading then begin
           load_torrent_file filename;
-          file_cancel (as_ft ft);
-         (try Sys.remove filename with _ -> ())
+          file_cancel (as_ft ft)
         end)
 
 let valid_torrent_extension url =
Index: mldonkey/src/networks/donkey/donkeyInteractive.ml
diff -u mldonkey/src/networks/donkey/donkeyInteractive.ml:1.103 
mldonkey/src/networks/donkey/donkeyInteractive.ml:1.104
--- mldonkey/src/networks/donkey/donkeyInteractive.ml:1.103     Sun May 14 
18:52:36 2006
+++ mldonkey/src/networks/donkey/donkeyInteractive.ml   Sun May 14 19:09:21 2006
@@ -170,6 +170,7 @@
       H.req_proxy = !CommonOptions.http_proxy;
       H.req_user_agent = get_user_agent ();
       H.req_max_retry = 10;
+      H.req_save = true;
     } in
     H.wget r (fun filename ->
       try
Index: mldonkey/src/networks/gnutella/gnutellaRedirector.ml
diff -u mldonkey/src/networks/gnutella/gnutellaRedirector.ml:1.12 
mldonkey/src/networks/gnutella/gnutellaRedirector.ml:1.13
--- mldonkey/src/networks/gnutella/gnutellaRedirector.ml:1.12   Fri May 12 
21:02:38 2006
+++ mldonkey/src/networks/gnutella/gnutellaRedirector.ml        Sun May 14 
19:09:21 2006
@@ -89,8 +89,6 @@
       
 let parse_hostfile file url_string = 
   let s = File.to_string file in
-  (* Http_client.wget does not delete the temp file anymore *)
-  (try Sys.remove file with _ -> ());
   if String2.starts_with s "ERROR" || String2.starts_with s "<" then begin
     if !verbose then lprintf_nl () "Malformed response content:\n%s" s;
     if List.mem url_string !!gnutella_hostfiles then begin
Index: mldonkey/src/utils/net/http_client.ml
diff -u mldonkey/src/utils/net/http_client.ml:1.29 
mldonkey/src/utils/net/http_client.ml:1.30
--- mldonkey/src/utils/net/http_client.ml:1.29  Fri May 12 21:02:39 2006
+++ mldonkey/src/utils/net/http_client.ml       Sun May 14 19:09:21 2006
@@ -50,6 +50,7 @@
     req_referer : Url.url option;
     req_retry : int;
     req_max_retry : int;
+    req_save : bool;
   }
 
 type content_handler = 
@@ -70,6 +71,7 @@
     req_accept = "*/*";
     req_retry = 0;
     req_max_retry = 0;
+    req_save = false;
   }
       
 let make_full_request r =
@@ -409,6 +411,7 @@
         Unix.utimes filename r.req_save_to_file_time r.req_save_to_file_time;
       try
         (f filename : unit);
+        if not r.req_save then Sys.remove filename
       with e ->  
         lprintf_nl () "Exception %s in loading downloaded file %s" 
(Printexc2.to_string e) filename;
         Sys.remove filename;
Index: mldonkey/src/utils/net/http_client.mli
diff -u mldonkey/src/utils/net/http_client.mli:1.5 
mldonkey/src/utils/net/http_client.mli:1.6
--- mldonkey/src/utils/net/http_client.mli:1.5  Thu Jan 19 02:13:19 2006
+++ mldonkey/src/utils/net/http_client.mli      Sun May 14 19:09:21 2006
@@ -43,6 +43,7 @@
     req_referer : Url.url option;
     req_retry : int;
     req_max_retry : int;
+    req_save : bool;
   }
 
 type content_handler =