[Mldonkey-commits] mldonkey config/Makefile.in distrib/ChangeLog s...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    05/12/14 21:23:30

Modified files:
        config         : Makefile.in 
        distrib        : ChangeLog 
        src/networks/donkey: donkeyInteractive.ml donkeyMain.ml 
                             donkeyOneFile.ml 
Removed files:
        src/networks/donkey: donkeyChunks.ml 

Log message:
        patch #4706

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/config/Makefile.in.diff?tr1=1.135&tr2=1.136&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.615&tr2=1.616&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyInteractive.ml.diff?tr1=1.73&tr2=1.74&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyMain.ml.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyOneFile.ml.diff?tr1=1.32&tr2=1.33&r1=text&r2=text

Patches:
Index: mldonkey/config/Makefile.in
diff -u mldonkey/config/Makefile.in:1.135 mldonkey/config/Makefile.in:1.136
--- mldonkey/config/Makefile.in:1.135   Wed Dec 14 21:17:46 2005
+++ mldonkey/config/Makefile.in Wed Dec 14 21:23:30 2005
@@ -334,7 +334,6 @@
   $(SRC_DONKEY)/donkeyShare.ml \
   $(SRC_DONKEY)/donkeyReliability.ml \
   $(SRC_DONKEY)/donkeyThieves.ml \
-  $(SRC_DONKEY)/donkeyChunks.ml \
   $(SRC_DONKEY)/donkeyNeighbours.ml \
   $(SRC_DONKEY)/donkeyStats.ml \
   $(SRC_DONKEY)/donkeyOneFile.ml \
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.615 mldonkey/distrib/ChangeLog:1.616
--- mldonkey/distrib/ChangeLog:1.615    Wed Dec 14 21:22:07 2005
+++ mldonkey/distrib/ChangeLog  Wed Dec 14 21:23:30 2005
@@ -12,6 +12,7 @@
 http://mldonkey.berlios.de/modules.php?name=Wiki&pagename=Windows
 
 2005/12/14
+4706: EDK: Remove donkeyChunks, use commonSwarming for op_file_check
 4702: Correct timezone in e-mail, nicer uptime, timezone and uptime in runinfo
 4694: Fix lots of compile warnings in Ocaml 3.09
 4705: Update config.guess and config.sub to version 2005-11-11
Index: mldonkey/src/networks/donkey/donkeyInteractive.ml
diff -u mldonkey/src/networks/donkey/donkeyInteractive.ml:1.73 
mldonkey/src/networks/donkey/donkeyInteractive.ml:1.74
--- mldonkey/src/networks/donkey/donkeyInteractive.ml:1.73      Wed Dec 14 
21:17:46 2005
+++ mldonkey/src/networks/donkey/donkeyInteractive.ml   Wed Dec 14 21:23:30 2005
@@ -562,6 +562,12 @@
   | _ ->  false
 
 
+let op_file_check file =
+  match file.file_swarmer with
+    None -> ()
+  | Some swarmer ->
+      Int64Swarmer.verify_all_chunks swarmer true
+
 let register_commands list =
   register_commands
     (List2.tail_map (fun (n,f,h) -> (n, "Network/Edonkey", f,h)) list)
@@ -905,10 +911,6 @@
         "download started"
     ), "<size> <md4> :\t\t\tdownload from size and md4";
 
-    "dup", Arg_none (fun _ ->
-        DonkeyChunks.duplicate_chunks (); "done"),
-    ":\t\t\t\t\tfind duplicate chunks (experimental)";
-
     "remove_old_servers", Arg_none (fun o ->
         let buf = o.conn_buf in
         DonkeyServers.remove_old_servers ();
@@ -1190,8 +1192,7 @@
   );
   file_ops.op_file_set_format <- (fun file format ->
       file.file_format <- format);
-  file_ops.op_file_check <- (fun file ->
-      DonkeyChunks.verify_chunks file);
+  file_ops.op_file_check <- op_file_check;
   file_ops.op_file_recover <- (fun file ->
       if file_state file = FileDownloading then
         reconnect_all file);
Index: mldonkey/src/networks/donkey/donkeyMain.ml
diff -u mldonkey/src/networks/donkey/donkeyMain.ml:1.40 
mldonkey/src/networks/donkey/donkeyMain.ml:1.41
--- mldonkey/src/networks/donkey/donkeyMain.ml:1.40     Wed Dec 14 21:17:46 2005
+++ mldonkey/src/networks/donkey/donkeyMain.ml  Wed Dec 14 21:23:30 2005
@@ -70,7 +70,6 @@
 
 let fivemin_timer timer =
   DonkeyShare.send_new_shared ();
-  DonkeyChunks.duplicate_chunks ();
   clients_root := []
 
 let second_timer timer =
Index: mldonkey/src/networks/donkey/donkeyOneFile.ml
diff -u mldonkey/src/networks/donkey/donkeyOneFile.ml:1.32 
mldonkey/src/networks/donkey/donkeyOneFile.ml:1.33
--- mldonkey/src/networks/donkey/donkeyOneFile.ml:1.32  Wed Dec 14 21:17:46 2005
+++ mldonkey/src/networks/donkey/donkeyOneFile.ml       Wed Dec 14 21:23:30 2005
@@ -45,7 +45,6 @@
 open DonkeyOptions
 open DonkeyComplexOptions
 open DonkeyGlobals
-open DonkeyChunks
 open DonkeyReliability
 open DonkeyStats