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

[mldonkey-commits]

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

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

Log message:
        patch #4730

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.631&tr2=1.632&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTTorrent.ml.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.631 mldonkey/distrib/ChangeLog:1.632
--- mldonkey/distrib/ChangeLog:1.631    Mon Dec 19 00:11:56 2005
+++ mldonkey/distrib/ChangeLog  Wed Dec 21 19:24:30 2005
@@ -11,6 +11,9 @@
 To compile MLDonkey on MinGW follow this guide:
 http://mldonkey.berlios.de/modules.php?name=Wiki&pagename=Windows
 
+2005/12/21
+4730: BT: parse path.utf-8 (zet)
+
 2005/12/19
 4726: New option space_overhead to adjust garbage collection (bogeyman)
 4724: Windows: 10 seconds pause when core start fails
Index: mldonkey/src/networks/bittorrent/bTTorrent.ml
diff -u mldonkey/src/networks/bittorrent/bTTorrent.ml:1.8 
mldonkey/src/networks/bittorrent/bTTorrent.ml:1.9
--- mldonkey/src/networks/bittorrent/bTTorrent.ml:1.8   Wed Dec 14 21:17:46 2005
+++ mldonkey/src/networks/bittorrent/bTTorrent.ml       Wed Dec 21 19:24:30 2005
@@ -94,19 +94,29 @@
             let current_length = ref zero in
             let length_set = ref false in
 
-            List.iter (fun (key, value) ->
-                match key, value with
-                  String "path", List path ->
-                    current_file :=
+            let path_list_to_string l =
                     Filepath.path_to_string '/'
-                      (List.map (fun v ->
+                (
+                  List.map (fun v ->
                           match v with
                             String s -> s
                           | _ -> assert false
-                      ) path);
+                  ) l
+                )
+            in
+
+            List.iter (fun (key, value) ->
+                match key, value with
+                  String "path", List path ->
+                    if !current_file = "" then begin
+                      current_file := path_list_to_string path;
+                      if !verbose_msg_servers then
+                        lprintf_nl "[BT]: Parsed a new path: [%s]" 
!current_file
+                    end   
+                | String "path.utf-8", List path_utf8 -> 
+                    current_file := path_list_to_string path_utf8;
                     if !verbose_msg_servers then
-                      lprintf_nl "[BT]: New file received :%s" !current_file
-                | String "path.utf-8", String path_utf8 -> ()
+                      lprintf_nl "[BT]: Parsed path.utf-8: [%s]" !current_file
                 | String "length", Int n ->
                     length := !length ++ n;
                     current_length := n;