[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/01/01 19:27:07

Modified files:
        distrib        : ChangeLog 
        src/networks/donkey: donkeyClient.ml donkeyGlobals.ml 
                             donkeyInteractive.ml donkeyShare.ml 

Log message:
        patch #4743

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.642&tr2=1.643&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyClient.ml.diff?tr1=1.76&tr2=1.77&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyGlobals.ml.diff?tr1=1.64&tr2=1.65&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyInteractive.ml.diff?tr1=1.77&tr2=1.78&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyShare.ml.diff?tr1=1.34&tr2=1.35&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.642 mldonkey/distrib/ChangeLog:1.643
--- mldonkey/distrib/ChangeLog:1.642    Sun Jan  1 19:25:42 2006
+++ mldonkey/distrib/ChangeLog  Sun Jan  1 19:27:07 2006
@@ -12,6 +12,8 @@
 http://mldonkey.berlios.de/modules.php?name=Wiki&pagename=Windows
 
 2006/01/01
+4743: EDK: Print "File is already shared" when trying to start downloading
+      an already shared file
 4744: Split client_timeout into ED2K-client_timeout and BT-client_timeout,
       increase BT-client_timeout to 90 (tradie)
 4745: Update config.guess and config.sub to version 2005-12-23
Index: mldonkey/src/networks/donkey/donkeyClient.ml
diff -u mldonkey/src/networks/donkey/donkeyClient.ml:1.76 
mldonkey/src/networks/donkey/donkeyClient.ml:1.77
--- mldonkey/src/networks/donkey/donkeyClient.ml:1.76   Wed Dec 28 21:37:39 2005
+++ mldonkey/src/networks/donkey/donkeyClient.ml        Sun Jan  1 19:27:07 2006
@@ -852,9 +852,8 @@
 let client_is_useful c file chunks = 
   DonkeySources.set_request_result c.client_source file.file_sources 
File_chunk;
   DonkeyOneFile.add_client_chunks c file chunks;
-  if file_state file = FileDownloading then begin
+  if file_state file = FileDownloading then
     DonkeyOneFile.request_slot c
-     end
 
 (* added in 2.5.25
 Check if the bitmap returned by a client contains a chunk that has not
Index: mldonkey/src/networks/donkey/donkeyGlobals.ml
diff -u mldonkey/src/networks/donkey/donkeyGlobals.ml:1.64 
mldonkey/src/networks/donkey/donkeyGlobals.ml:1.65
--- mldonkey/src/networks/donkey/donkeyGlobals.ml:1.64  Wed Dec 28 21:37:39 2005
+++ mldonkey/src/networks/donkey/donkeyGlobals.ml       Sun Jan  1 19:27:07 2006
@@ -773,7 +773,6 @@
   Printf.bprintf buf "  overnet_connect_tags: %d\n" (List.length 
!overnet_connect_tags);
   Printf.bprintf buf "  clients_root: %d\n" (List.length !clients_root);
   Printf.bprintf buf "  servers_list: %d\n" (List.length !servers_list);
-  Printf.bprintf buf "  current_files: %d\n" (List.length !current_files);
   Printf.bprintf buf "  xs_servers_list: %d\n" (List.length !xs_servers_list);
   Printf.bprintf buf "  connected_server_list: %d\n" (List.length 
!connected_server_list);
   Printf.bprintf buf "  udp_servers_list: %d\n" (List.length 
!udp_servers_list);
Index: mldonkey/src/networks/donkey/donkeyInteractive.ml
diff -u mldonkey/src/networks/donkey/donkeyInteractive.ml:1.77 
mldonkey/src/networks/donkey/donkeyInteractive.ml:1.78
--- mldonkey/src/networks/donkey/donkeyInteractive.ml:1.77      Sun Dec 18 
14:50:38 2005
+++ mldonkey/src/networks/donkey/donkeyInteractive.ml   Sun Jan  1 19:27:07 2006
@@ -195,6 +195,8 @@
 
 let already_downloading = Failure "File is already in download queue"
 
+let already_shared = Failure "File is already shared"
+
 let really_query_download filenames size md4 location old_file absents =
 
   begin
@@ -325,11 +327,16 @@
   else
     begin
       try
-        let _ = find_file md4 in
+        let file = find_file md4 in
+         if (file_state file) = FileShared then
+           raise already_shared
+         else
+           begin
 (* jave TODO: if a user currently not downloading this file is requesting the 
download add this user
    to the list of users currently downloading this file *)
-         forceable_download := [];
-         raise already_downloading 
+             forceable_download := [];
+             raise already_downloading 
+           end
       with Not_found ->
         begin
         if List.mem md4 !!old_files then begin
Index: mldonkey/src/networks/donkey/donkeyShare.ml
diff -u mldonkey/src/networks/donkey/donkeyShare.ml:1.34 
mldonkey/src/networks/donkey/donkeyShare.ml:1.35
--- mldonkey/src/networks/donkey/donkeyShare.ml:1.34    Sat Dec 24 02:36:09 2005
+++ mldonkey/src/networks/donkey/donkeyShare.ml Sun Jan  1 19:27:07 2006
@@ -152,7 +152,7 @@
 let all_shared () =
   let shared_files = ref [] in
   Hashtbl.iter (fun md4 file ->
-      match  file.file_shared with
+      match file.file_shared with
         None -> ()
       | Some _ ->  shared_files := file :: !shared_files
   ) files_by_md4;
@@ -271,9 +271,8 @@
         let s = Hashtbl.find shared_files_info
             (fullname, size, mtime) in
         (* if s.sh_mtime = mtime && s.sh_size = size then begin *)
-            if !verbose_share then begin
+            if !verbose_share then
                 lprintf_nl () "donkeyShare: Using old MD4s for %s" fullname;
-              end;
             new_file_to_share s codedname None
 (*          end else begin
             if !verbose_share then begin