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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/07/09 23:44:34

Modified files:
        distrib        : ChangeLog 
        src/networks/bittorrent: bTTorrent.ml 

Log message:
        patch #6063

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1299&r2=1.1300
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTTorrent.ml?cvsroot=mldonkey&r1=1.12&r2=1.13

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1299
retrieving revision 1.1300
diff -u -b -r1.1299 -r1.1300
--- distrib/ChangeLog   3 Jul 2007 14:13:43 -0000       1.1299
+++ distrib/ChangeLog   9 Jul 2007 23:44:33 -0000       1.1300
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2007/07/10
+6063: BT: Better detect single-file torrents
+
 2007/07/03
 6068: BT: Fix download start when torrents/downloads filesystem
       allows more than 16M chars

Index: src/networks/bittorrent/bTTorrent.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTTorrent.ml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- src/networks/bittorrent/bTTorrent.ml        11 Feb 2007 13:09:41 -0000      
1.12
+++ src/networks/bittorrent/bTTorrent.ml        9 Jul 2007 23:44:34 -0000       
1.13
@@ -275,23 +275,20 @@
   assert (!file_name <> "");
   assert (!file_piece_size <> zero);
   assert (!file_pieces <> "");
-
   assert (!file_info = Bencode.decode (Bencode.encode !file_info));
 
   let file_id = Sha1.string (Bencode.encode !file_info) in
-  let npieces =
-    1+ Int64.to_int ((!length -- one) // !file_piece_size)
-  in
-(*            lprintf "npieces %d length %Ld piece %Ld %d\n"
-              npieces !length !file_piece_size (String.length !file_pieces); *)
+  let npieces = 1 + Int64.to_int ((!length -- one) // !file_piece_size) in
   let pieces = Array.init npieces (fun i ->
         let s = String.sub !file_pieces (i*20) 20 in
         Sha1.direct_of_string s
     ) in
 
-(*  if !file_files <> [] && not (String2.check_suffix !file_name ".torrent") 
then
-    file_name := !file_name ^ ".torrent";*)
-  file_files := List.rev !file_files;
+  (match List.length !file_files with
+  | 0 -> ()
+  | 1 -> file_name := (fst (List.hd !file_files));
+         file_files := []
+  | _ -> file_files := List.rev !file_files);
 
   file_id, {
     torrent_name = !file_name;