[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...
|
From: |
mldonkey-commits |
|
Subject: |
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co... |
|
Date: |
Fri, 01 Sep 2006 16:22:16 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 06/09/01 16:22:15
Modified files:
distrib : ChangeLog
src/daemon/common: commonComplexOptions.ml commonFile.ml
commonFile.mli commonOptions.ml
giftEncoding.ml guiDecoding.ml guiEncoding.ml
guiTypes.ml
src/daemon/driver: driverCommands.ml driverInteractive.ml
src/gtk/gui : gui_downloads.ml
src/gtk/newgui : gui_downloads.ml gui_types.ml
src/gtk2/gui : guiInfoWindow.ml guiMessages.ml guiTypes2.ml
src/networks/bittorrent: bTInteractive.ml
src/networks/donkey: donkeyClient.ml donkeyComplexOptions.ml
donkeyGlobals.ml donkeyInteractive.ml
donkeyShare.ml donkeyTypes.ml
src/networks/fasttrack: fasttrackGlobals.ml fasttrackHandler.ml
src/networks/fileTP: fileTPGlobals.ml fileTPInteractive.ml
fileTPTypes.ml
src/networks/gnutella: gnutellaGlobals.ml gnutellaInteractive.ml
gnutellaTypes.ml
src/networks/opennap: opennapInteractive.ml
src/networks/soulseek: slskInteractive.ml
Log message:
patch #5354
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.982&r2=1.983
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonComplexOptions.ml?cvsroot=mldonkey&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonFile.ml?cvsroot=mldonkey&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonFile.mli?cvsroot=mldonkey&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonOptions.ml?cvsroot=mldonkey&r1=1.170&r2=1.171
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/giftEncoding.ml?cvsroot=mldonkey&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/guiDecoding.ml?cvsroot=mldonkey&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/guiEncoding.ml?cvsroot=mldonkey&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/guiTypes.ml?cvsroot=mldonkey&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.168&r2=1.169
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverInteractive.ml?cvsroot=mldonkey&r1=1.95&r2=1.96
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk/gui/gui_downloads.ml?cvsroot=mldonkey&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk/newgui/gui_downloads.ml?cvsroot=mldonkey&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk/newgui/gui_types.ml?cvsroot=mldonkey&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiInfoWindow.ml?cvsroot=mldonkey&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiMessages.ml?cvsroot=mldonkey&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiTypes2.ml?cvsroot=mldonkey&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTInteractive.ml?cvsroot=mldonkey&r1=1.103&r2=1.104
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyClient.ml?cvsroot=mldonkey&r1=1.97&r2=1.98
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyComplexOptions.ml?cvsroot=mldonkey&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyGlobals.ml?cvsroot=mldonkey&r1=1.88&r2=1.89
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyInteractive.ml?cvsroot=mldonkey&r1=1.118&r2=1.119
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyShare.ml?cvsroot=mldonkey&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyTypes.ml?cvsroot=mldonkey&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/fasttrack/fasttrackGlobals.ml?cvsroot=mldonkey&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/fasttrack/fasttrackHandler.ml?cvsroot=mldonkey&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/fileTP/fileTPGlobals.ml?cvsroot=mldonkey&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/fileTP/fileTPInteractive.ml?cvsroot=mldonkey&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/fileTP/fileTPTypes.ml?cvsroot=mldonkey&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/gnutella/gnutellaGlobals.ml?cvsroot=mldonkey&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/gnutella/gnutellaInteractive.ml?cvsroot=mldonkey&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/gnutella/gnutellaTypes.ml?cvsroot=mldonkey&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/opennap/opennapInteractive.ml?cvsroot=mldonkey&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/soulseek/slskInteractive.ml?cvsroot=mldonkey&r1=1.21&r2=1.22
Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.982
retrieving revision 1.983
diff -u -b -r1.982 -r1.983
--- distrib/ChangeLog 1 Sep 2006 16:19:56 -0000 1.982
+++ distrib/ChangeLog 1 Sep 2006 16:22:14 -0000 1.983
@@ -15,6 +15,7 @@
=========
2006/09/01
+5354: New option: max_filenames, maximum number of different filenames
5355: Move buffer_writes_delay timer from Donkey to Global module
5344: Small code optimization for stderr warnings (thx to pango)
Index: src/daemon/common/commonComplexOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonComplexOptions.ml,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- src/daemon/common/commonComplexOptions.ml 16 Aug 2006 19:12:55 -0000
1.59
+++ src/daemon/common/commonComplexOptions.ml 1 Sep 2006 16:22:14 -0000
1.60
@@ -68,6 +68,8 @@
match v with
Options.Module assocs ->
let get_value name conv = conv (List.assoc name assocs) in
+ let get_value_nil name conv =
+ try conv (List.assoc name assocs) with Not_found -> [] in
let network = try get_value "file_network" value_to_string
with _ -> "Donkey" in
let network =
@@ -106,6 +108,12 @@
set_file_best_name file
(get_value "file_filename" value_to_string) "" 0
with _ -> ());
+
+ (try
+ List.iter (fun s -> add_file_filenames file s)
+ (get_value_nil "file_filenames" (value_to_list value_to_string))
+ with _ -> ());
+
set_file_priority file priority;
if !verbose then lprintf_nl "New %s file %s"
@@ -127,6 +135,8 @@
("file_priority", int_to_value (file_priority file)) ::
("file_state", state_to_value (file_state file)) ::
("file_filename", string_to_value (file_best_name file)) ::
+ ("file_filenames", List
+ (List.map string_to_value impl.impl_file_filenames)) ::
("file_age", IntValue (Int64.of_int impl.impl_file_age)) ::
(file_to_option file)
)
@@ -934,6 +944,7 @@
let load () =
Options.load files_ini;
+ shorten_all_file_filenames !!max_filenames;
Options.load servers_ini;
Options.load searches_ini;
Options.load results_ini;
@@ -1103,6 +1114,9 @@
CommonBlocking.set_geoip_dat !!geoip_dat
with _ -> ()
);
+ option_hook max_filenames (fun _ ->
+ shorten_all_file_filenames !!max_filenames
+ );
option_hook max_opened_connections (fun _ ->
if !verbose then lprintf_nl
"checking max_opened_connections = %d for validity"
!!max_opened_connections;
Index: src/daemon/common/commonFile.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonFile.ml,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- src/daemon/common/commonFile.ml 28 Aug 2006 18:20:18 -0000 1.58
+++ src/daemon/common/commonFile.ml 1 Sep 2006 16:22:14 -0000 1.59
@@ -56,6 +56,7 @@
mutable impl_file_last_received : (int64 * int) list;
mutable impl_file_last_rate : float;
mutable impl_file_best_name : string;
+ mutable impl_file_filenames : string list;
mutable impl_file_magic : string option;
mutable impl_file_priority: int; (* normal = 0, low < 0, high > 0 *)
mutable impl_file_last_seen : int;
@@ -127,6 +128,7 @@
impl_file_last_received = [];
impl_file_last_rate = 0.0;
impl_file_best_name = "<UNKNOWN>";
+ impl_file_filenames = [];
impl_file_magic = None;
impl_file_priority = 0;
impl_file_last_seen = 0;
@@ -268,6 +270,25 @@
(String.escaped old_name) (String.escaped file.impl_file_best_name)
end
+let add_file_filenames file name =
+ let impl = as_file_impl file in
+ if name <> ""
+ && not (List.mem name impl.impl_file_filenames)
+ && List.length impl.impl_file_filenames < !!max_filenames then
+ impl.impl_file_filenames <- name :: impl.impl_file_filenames;
+ file_must_update file
+
+let shorten_all_file_filenames length =
+ H.iter (fun file ->
+ let impl = as_file_impl file in
+ if List.length impl.impl_file_filenames > length then
+ begin
+ let new_list, _ = List2.cut !!max_filenames impl.impl_file_filenames in
+ impl.impl_file_filenames <- new_list;
+ file_must_update file
+ end
+ ) files_by_num
+
let set_file_format (file : file) format =
let file = as_file_impl file in
file.impl_file_ops.op_file_set_format file.impl_file_val format
@@ -677,7 +698,7 @@
None -> ()
| Some filename ->
Printf.bprintf buf "Probable name: %s\n" filename);
- List.iter (fun (name,_) -> Printf.bprintf buf " (%s)\n" name)
info.G.file_names
+ List.iter (fun name -> Printf.bprintf buf " (%s)\n" name)
info.G.file_names
end;
(try
@@ -1036,6 +1057,7 @@
T.file_fields = T.Fields_file_info.all;
T.file_comment = impl.impl_file_comment;
T.file_name = impl.impl_file_best_name;
+ T.file_names = impl.impl_file_filenames;
T.file_num = impl.impl_file_num;
T.file_size = impl.impl_file_size;
T.file_downloaded = impl.impl_file_downloaded;
@@ -1046,7 +1068,6 @@
T.file_last_seen = impl.impl_file_last_seen;
T.file_network = 0;
- T.file_names = [];
T.file_md4 = Md4.null;
T.file_all_sources = 0;
T.file_active_sources = 0;
Index: src/daemon/common/commonFile.mli
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonFile.mli,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- src/daemon/common/commonFile.mli 28 Aug 2006 18:20:18 -0000 1.18
+++ src/daemon/common/commonFile.mli 1 Sep 2006 16:22:14 -0000 1.19
@@ -33,6 +33,7 @@
mutable impl_file_last_received : (int64 * int) list;
mutable impl_file_last_rate : float;
mutable impl_file_best_name : string;
+ mutable impl_file_filenames : string list;
mutable impl_file_magic : string option;
mutable impl_file_priority : int;
mutable impl_file_last_seen : int;
@@ -83,6 +84,8 @@
val set_file_state : CommonTypes.file -> CommonTypes.file_state -> unit
val file_best_name : CommonTypes.file -> string
val set_file_best_name : CommonTypes.file -> string -> string -> int -> unit
+val add_file_filenames : CommonTypes.file -> string -> unit
+val shorten_all_file_filenames : int -> unit
val set_file_format : CommonTypes.file -> CommonTypes.format -> unit
val file_check : CommonTypes.file -> unit
val file_recover : CommonTypes.file -> unit
Index: src/daemon/common/commonOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonOptions.ml,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -b -r1.170 -r1.171
--- src/daemon/common/commonOptions.ml 21 Aug 2006 18:29:20 -0000 1.170
+++ src/daemon/common/commonOptions.ml 1 Sep 2006 16:22:14 -0000 1.171
@@ -1388,6 +1388,10 @@
"The size long names will be shortened to in the interface"
int_option 50
+let max_filenames = define_expert_option current_section ["max_filenames"]
+ "The maximum number of different filenames used by MLDonkey"
+ int_option 50
+
let max_client_name_len = define_expert_option current_section
["max_client_name_len"]
"The size long client names will be shortened to in the interface"
int_option 25
Index: src/daemon/common/giftEncoding.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/giftEncoding.ml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/daemon/common/giftEncoding.ml 6 Sep 2005 11:24:59 -0000 1.4
+++ src/daemon/common/giftEncoding.ml 1 Sep 2006 16:22:14 -0000 1.5
@@ -135,7 +135,7 @@
GiftCommand("size", Some (Int64.to_string file.file_size), []);
GiftCommand("file", Some (match file.file_names with
[] -> "no name"
- | (name,_) :: _ -> name), []);
+ | name :: _ -> name), []);
GiftCommand("shared", Some "1", []);
GiftCommand("throughput",
Index: src/daemon/common/guiDecoding.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/guiDecoding.ml,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- src/daemon/common/guiDecoding.ml 14 Jul 2006 13:14:01 -0000 1.58
+++ src/daemon/common/guiDecoding.ml 1 Sep 2006 16:22:14 -0000 1.59
@@ -548,7 +548,6 @@
let comment, pos = if proto > 21 then
get_string s pos
else "", pos in
- let names = List.map (fun name -> name, noips()) names in
let last_seen = BasicSocket.last_time () - last_seen in
let uids, pos =
if proto < 31 then
Index: src/daemon/common/guiEncoding.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/guiEncoding.ml,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- src/daemon/common/guiEncoding.ml 12 Aug 2006 18:15:11 -0000 1.56
+++ src/daemon/common/guiEncoding.ml 1 Sep 2006 16:22:14 -0000 1.57
@@ -410,7 +410,7 @@
end;
if f.file_fields.Fields_file_info.file_names then begin
buf_int8 buf 2;
- buf_list buf buf_string (List.map fst f.file_names);
+ buf_list buf buf_string f.file_names;
end;
if f.file_fields.Fields_file_info.file_md4 then begin
buf_int8 buf 3;
@@ -489,7 +489,7 @@
buf_int buf x
| Fields_file_info.File_names x ->
buf_int8 buf 2;
- buf_list buf buf_string (List.map fst x);
+ buf_list buf buf_string x;
| Fields_file_info.File_md4 x ->
buf_int8 buf 3;
buf_md4 buf x
@@ -551,7 +551,7 @@
let buf_file proto buf f =
buf_int buf f.file_num;
buf_int buf f.file_network;
- buf_list buf buf_string (List.map fst f.file_names);
+ buf_list buf buf_string f.file_names;
buf_md4 buf f.file_md4;
buf_int64_2 proto buf f.file_size;
buf_int64_2 proto buf f.file_downloaded;
Index: src/daemon/common/guiTypes.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/guiTypes.ml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- src/daemon/common/guiTypes.ml 11 Jun 2006 17:37:38 -0000 1.28
+++ src/daemon/common/guiTypes.ml 1 Sep 2006 16:22:14 -0000 1.29
@@ -20,13 +20,6 @@
open Md4
open CommonTypes
-type ips_list = {
- mutable nips : int;
- mutable ips : Ip.t list;
- }
-
-let noips () = { ips = []; nips = 0; }
-
type 'a search_request = {
mutable search_num : int;
mutable search_type : search_type;
@@ -97,7 +90,7 @@
| File_network of int
| File_comment of string
| File_name of string
- | File_names of (string * ips_list) list
+ | File_names of string list
| File_md4 of Md4.t
| File_size of int64
| File_downloaded of int64
@@ -125,7 +118,7 @@
file_network : int;
mutable file_comment : string;
mutable file_name : string;
- mutable file_names : (string * ips_list) list;
+ mutable file_names : string list;
mutable file_md4 : Md4.t;
mutable file_size : int64;
mutable file_downloaded : int64; (* LOT OF CHANGES *)
@@ -315,7 +308,7 @@
file_name = "tratra";
file_num = 356;
file_network = 873;
- file_names = ["toto", noips(); "tutu", noips()];
+ file_names = ["toto"; "tutu"];
file_md4 = Md4.random ();
file_size = Int64.of_string "68758765";
file_active_sources = 12;
Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -b -r1.168 -r1.169
--- src/daemon/driver/driverCommands.ml 28 Aug 2006 19:02:17 -0000 1.168
+++ src/daemon/driver/driverCommands.ml 1 Sep 2006 16:22:14 -0000 1.169
@@ -1697,6 +1697,7 @@
strings_of_option messages_filter;
strings_of_option max_displayed_results;
strings_of_option max_name_len;
+ strings_of_option max_filenames;
strings_of_option max_client_name_len;
strings_of_option emule_mods_count;
strings_of_option emule_mods_showall;
Index: src/daemon/driver/driverInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- src/daemon/driver/driverInteractive.ml 28 Aug 2006 19:02:17 -0000
1.95
+++ src/daemon/driver/driverInteractive.ml 1 Sep 2006 16:22:14 -0000
1.96
@@ -2256,7 +2256,6 @@
let score_list =
List.map (fun fileinfo ->
- let filenameset = List.map fst fileinfo.file_names in
(* canonize filenames by keeping only lowercase words, and
sorting them so that initial order doesn't matter;
Remove duplicate canonized filenames *)
@@ -2264,7 +2263,7 @@
let new_fn =
Array.of_list (List.sort String.compare (canonized_words fn)) in
if List.mem new_fn acc then acc else new_fn :: acc
- ) [] filenameset) in
+ ) [] fileinfo.file_names) in
(* precalculate all Levenshtein distances
That's currently the most expensive phase when lots of
different filenames exist
Index: src/gtk/gui/gui_downloads.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk/gui/gui_downloads.ml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- src/gtk/gui/gui_downloads.ml 12 Jun 2006 11:03:23 -0000 1.11
+++ src/gtk/gui/gui_downloads.ml 1 Sep 2006 16:22:14 -0000 1.12
@@ -42,7 +42,7 @@
let save_menu_items file =
List.map
- (fun (name,_) ->
+ (fun name ->
`I (name,
(fun _ ->
Gui_com.send (GuiProto.SaveFile (file.file_num, name))
Index: src/gtk/newgui/gui_downloads.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk/newgui/gui_downloads.ml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- src/gtk/newgui/gui_downloads.ml 12 Jun 2006 10:02:58 -0000 1.16
+++ src/gtk/newgui/gui_downloads.ml 1 Sep 2006 16:22:14 -0000 1.17
@@ -129,7 +129,7 @@
let save_menu_items file =
List.map
- (fun (name,_) ->
+ (fun name ->
`I (name,
(fun _ ->
match file.data.gfile_state with
@@ -467,7 +467,7 @@
Printf.sprintf "%5.1f"
(Int64.to_float f.data.gfile_downloaded /. Int64.to_float
f.data.gfile_size *. 100.)
else ""
- else fst (List.hd f.data.gfile_names)
+ else List.hd f.data.gfile_names
| Col_file_rate ->
if (List.length f.data.gfile_num) = 1 then
if f.data.gfile_download_rate > 0. then
@@ -1155,7 +1155,7 @@
if icons_are_used then
Printf.sprintf "Client %d" client_num
else " |-- " ^ (Printf.sprintf "Client %d" client_num);
- gfile_names = ["", noips()];
+ gfile_names = [""];
gfile_md4 = file.data.gfile_md4;
gfile_size = Int64.of_string "0";
gfile_downloaded = Int64.of_string "0";
@@ -1387,8 +1387,7 @@
then c.client_software
else (c.client_software ^
" - " ^
- c.client_emulemod)),
- noips()];
+
c.client_emulemod))];
child.data.gfile_size <- c.client_uploaded;
child.data.gfile_downloaded <- c.client_downloaded;
child.data.gfile_state <- client_to_general_state
c.client_state (List.hd f.data.gfile_num);
@@ -1410,8 +1409,7 @@
begin
f.data.gfile_names <- [c.client_software ^
" - " ^
- c.client_emulemod,
- noips()];
+ c.client_emulemod];
f.data.gfile_state <- client_to_general_state c.client_state
file_num;
f.data.gfile_size <- c.client_uploaded;
f.data.gfile_downloaded <- c.client_downloaded;
Index: src/gtk/newgui/gui_types.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk/newgui/gui_types.ml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/gtk/newgui/gui_types.ml 12 Jun 2006 10:02:58 -0000 1.10
+++ src/gtk/newgui/gui_types.ml 1 Sep 2006 16:22:14 -0000 1.11
@@ -44,7 +44,7 @@
mutable gfile_network : int;
mutable gfile_name : string;
- mutable gfile_names : (string * ips_list)list;
+ mutable gfile_names : string list;
mutable gfile_md4 : Md4.t;
mutable gfile_size : int64;
mutable gfile_downloaded : int64;
Index: src/gtk2/gui/guiInfoWindow.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiInfoWindow.ml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/gtk2/gui/guiInfoWindow.ml 14 Nov 2005 18:25:44 -0000 1.5
+++ src/gtk2/gui/guiInfoWindow.ml 1 Sep 2006 16:22:14 -0000 1.6
@@ -325,19 +325,16 @@
let file_name = U.utf8_of f.g_file_name in
let cols = new GTree.column_list in
let file_names = cols#add Gobject.Data.string in
- let file_count = cols#add Gobject.Data.int in
let file_names_pixb = cols#add Gobject.Data.gobject_option in
let liststore = GTree.list_store cols in
let listmodel = GTree.model_sort liststore in
listmodel#set_sort_func 0 (sort_function file_names);
- listmodel#set_sort_func 1 (sort_function file_count);
- List.iter (fun (name, ips) ->
+ List.iter (fun name ->
let s = U.utf8_of name in
let pixb = (Mi.file_type_of_name name ~size:A.SMALL) in
let row = liststore#append () in
liststore#set ~row ~column:file_names_pixb pixb;
liststore#set ~row ~column:file_names s;
- liststore#set ~row ~column:file_count ips.nips;
) f.g_file_names;
let col_name =
let col = GTree.view_column ~title:!M.fW_lb_file_names_col () in
@@ -354,17 +351,6 @@
col#set_sort_column_id 0;
col
in
- let col_count =
- let col = GTree.view_column ~title:!M.fW_lb_file_count_col () in
- col#set_resizable true;
- col#set_clickable true;
- col#set_sizing `FIXED;
- let renderer = GTree.cell_renderer_text [`XALIGN 0.] in
- col#pack renderer;
- col#add_attribute renderer "text" file_count;
- col#set_sort_column_id 1;
- col
- in
let vbox = GPack.vbox ~homogeneous:false ~spacing:6 () in
let scrolled_box =
GBin.scrolled_window ~hpolicy:`AUTOMATIC ~vpolicy:`AUTOMATIC
@@ -373,7 +359,6 @@
in
let view = GTree.view ~model:listmodel ~height ~packing:scrolled_box#add ()
in
ignore (view#append_column col_name);
- ignore (view#append_column col_count);
let hbox =
GPack.hbox ~homogeneous:false ~spacing:6
~packing:(vbox#pack ~expand:true ~fill:true) ()
Index: src/gtk2/gui/guiMessages.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiMessages.ml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- src/gtk2/gui/guiMessages.ml 27 Jun 2006 10:38:36 -0000 1.11
+++ src/gtk2/gui/guiMessages.ml 1 Sep 2006 16:22:14 -0000 1.12
@@ -388,7 +388,6 @@
let fW_lb_file_eta = ref ""
let fW_lb_rename = ref ""
let fW_lb_file_names_col = ref ""
-let fW_lb_file_count_col = ref ""
let fW_wt_show_source_details = ref ""
let fW_lb_source_info = ref ""
let fW_lb_files_requested = ref ""
@@ -855,7 +854,6 @@
fW_lb_file_eta := _s_ "ETA (inst / average)";
fW_lb_rename := _s "Rename file";
fW_lb_file_names_col := _s "File names";
- fW_lb_file_count_col := _s "Sources";
fW_wt_show_source_details := _s "Client details";
fW_lb_source_info := _s "Client information";
fW_lb_files_requested := _s "Files requested";
Index: src/gtk2/gui/guiTypes2.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiTypes2.ml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- src/gtk2/gui/guiTypes2.ml 15 Jul 2006 11:46:57 -0000 1.11
+++ src/gtk2/gui/guiTypes2.ml 1 Sep 2006 16:22:14 -0000 1.12
@@ -232,7 +232,7 @@
mutable g_file_comment : string;
mutable g_file_name : string;
- mutable g_file_names : (string * ips_list) list;
+ mutable g_file_names : string list;
mutable g_file_size : int64;
mutable g_file_downloaded : int64;
mutable g_file_active_sources : int;
Index: src/networks/bittorrent/bTInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -b -r1.103 -r1.104
--- src/networks/bittorrent/bTInteractive.ml 12 Aug 2006 20:36:14 -0000
1.103
+++ src/networks/bittorrent/bTInteractive.ml 1 Sep 2006 16:22:14 -0000
1.104
@@ -421,7 +421,6 @@
P.file_name = file.file_name;
P.file_network = network.network_num;
- P.file_names = [file.file_name, P.noips()];
P.file_chunks = (match file.file_swarmer with
| None -> None
| Some swarmer -> Some (CommonSwarming.chunks_verified_bitmap swarmer));
@@ -448,7 +447,7 @@
P.file_name = ft.ft_filename;
P.file_num = ft_num ft;
P.file_network = network.network_num;
- P.file_names = [ft.ft_filename, P.noips()];
+ P.file_names = [ft.ft_filename];
P.file_md4 = Md4.null;
P.file_size = ft_size ft;
P.file_downloaded = zero;
Index: src/networks/donkey/donkeyClient.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyClient.ml,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- src/networks/donkey/donkeyClient.ml 16 Aug 2006 19:12:09 -0000 1.97
+++ src/networks/donkey/donkeyClient.ml 1 Sep 2006 16:22:14 -0000 1.98
@@ -1405,22 +1405,7 @@
c.client_rating <- c.client_rating + 1;
client_has_file c file;
-
- begin
- let ips =
- try
- List.assoc t.Q.name file.file_filenames
- with Not_found ->
- let ips = noips() in
- file.file_filenames <- file.file_filenames @ [t.Q.name, ips];
- update_best_name file;
- ips
- in
- if not (List.mem c.client_ip ips.ips) then begin
- ips.ips <- c.client_ip :: ips.ips;
- ips.nips <- 1 + ips.nips;
- end
- end;
+ add_file_filenames (as_file file) t.Q.name;
if file_size file <= block_size then begin
client_is_useful c file (Bitv.create 1 true)
Index: src/networks/donkey/donkeyComplexOptions.ml
===================================================================
RCS file:
/sources/mldonkey/mldonkey/src/networks/donkey/donkeyComplexOptions.ml,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- src/networks/donkey/donkeyComplexOptions.ml 28 Aug 2006 18:19:15 -0000
1.54
+++ src/networks/donkey/donkeyComplexOptions.ml 1 Sep 2006 16:22:14 -0000
1.55
@@ -231,9 +231,6 @@
let value_to_file file_size file_state assocs =
let get_value name conv = conv (List.assoc name assocs) in
- let get_value_nil name conv =
- try conv (List.assoc name assocs) with _ -> []
- in
let file_md4 =
try
@@ -274,11 +271,8 @@
filename
in
- let filenames = List.map (fun name -> name, GuiTypes.noips())
- (get_value_nil "file_filenames" (value_to_list value_to_string)) in
-
let file = DonkeyGlobals.new_file file_diskname file_state
- (Md4.of_string file_md4) file_size filenames true in
+ (Md4.of_string file_md4) file_size "" true in
(try
set_file_best_name (as_file file)
@@ -309,8 +303,6 @@
"file_diskname", string_to_value file.file_diskname;
("file_md4s",
array_to_value Md4.hash_to_value file.file_computed_md4s);
- "file_filenames", List
- (List.map (fun (s,_) -> string_to_value s) file.file_filenames);
]
in
let fields =
Index: src/networks/donkey/donkeyGlobals.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyGlobals.ml,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- src/networks/donkey/donkeyGlobals.ml 1 Sep 2006 16:19:56 -0000
1.88
+++ src/networks/donkey/donkeyGlobals.ml 1 Sep 2006 16:22:14 -0000
1.89
@@ -311,7 +311,7 @@
set_file_best_name file best_name "" 0
with Not_found -> ()
-let new_file file_diskname file_state md4 file_size filenames writable =
+let new_file file_diskname file_state md4 file_size filename writable =
try
let file = find_file md4 in
@@ -393,7 +393,6 @@
file_swarmer = None;
file_nchunks = get_nchunks file_size;
file_nchunk_hashes = get_nchunk_hashes file_size;
- file_filenames = filenames;
file_computed_md4s = Array.of_list md4s;
file_format = FormatNotComputed 0;
file_sources = DonkeySources.create_file_sources_manager
@@ -407,6 +406,7 @@
impl_file_size = file_size;
impl_file_fd = Some t;
impl_file_best_name = Filename.basename file_diskname;
+ impl_file_filenames = (if filename = "" then [] else [filename]);
impl_file_last_seen = last_time () - 100 * 24 * 3600;
}
in
Index: src/networks/donkey/donkeyInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyInteractive.ml,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- src/networks/donkey/donkeyInteractive.ml 28 Aug 2006 18:20:18 -0000
1.118
+++ src/networks/donkey/donkeyInteractive.ml 1 Sep 2006 16:22:14 -0000
1.119
@@ -69,7 +69,7 @@
let op_file_proposed_filenames file =
- List2.tail_map fst file.file_filenames
+ file.file_file.impl_file_filenames
let reconnect_all file =
DonkeyProtoOvernet.Overnet.recover_file file;
@@ -188,7 +188,7 @@
let already_shared = Failure (Printf.sprintf (_b "File is already shared"))
-let really_query_download filenames size md4 location old_file absents =
+let really_query_download filename size md4 location old_file absents =
begin
try
@@ -226,15 +226,7 @@
end;
(* TODO RESULT let other_names = DonkeyIndexer.find_names md4 in *)
- let filenames =
- let other_names = [] in
- let filenames = List.fold_left (fun names name ->
- if List.mem name names then names else names @ [name]
- ) filenames other_names in
- (List.map (fun name -> name , { ips=[]; nips=0}) filenames)
- in
-
- let file = new_file file_diskname FileDownloading md4 size filenames true in
+ let file = new_file file_diskname FileDownloading md4 size filename true in
begin
match absents with
None -> ()
@@ -303,7 +295,7 @@
);
as_file file
-let query_download filenames size md4 location old_file absents force =
+let query_download filename size md4 location old_file absents force =
if force then
if !forceable_download = [] then
raise no_download_to_force
@@ -311,7 +303,7 @@
begin
let f = List.hd !forceable_download in
forceable_download := [];
- really_query_download f.result_names f.result_size md4 None None None
+ really_query_download (List.hd f.result_names) f.result_size md4 None
None None
end
else
begin
@@ -332,7 +324,7 @@
(* copy file info into result for later usage in force_download *)
let r = { dummy_result with
result_uids = [Uid.create (Ed2k md4)];
- result_names = filenames;
+ result_names = [filename];
result_size = size;
result_force = true; (* marker for force_download *)
result_modified = false;
@@ -344,7 +336,7 @@
else
begin
forceable_download := [];
- really_query_download filenames size md4 location old_file absents
+ really_query_download filename size md4 location old_file absents
end
end
end
@@ -356,7 +348,7 @@
| uid :: tail ->
match Uid.to_uid uid with
Ed2k md4 ->
- query_download filenames r.result_size md4 None None None force
+ query_download (List.hd filenames) r.result_size md4 None None
None force
| _ -> iter tail
in
iter r.result_uids
@@ -383,19 +375,22 @@
if Sys.file_exists met then
let s = File.to_string met in
let f = P.read s in
- let filenames = ref [] in
+ let filename_met = ref None in
let size = ref Int64.zero in
List.iter (fun tag ->
match tag with
{ tag_name = Field_Filename; tag_value = String s } ->
lprintf_nl "Import Donkey %s" s;
- filenames := s :: !filenames;
+ filename_met := Some s;
| { tag_name = Field_Size; tag_value = Uint64 v } ->
size := v
| _ -> ()
) f.P.tags;
- ignore (really_query_download !filenames !size f.P.md4 None
+ ignore (really_query_download
+ (match !filename_met with
+ None -> filename
+ | Some s -> s) !size f.P.md4 None
(Some filename) (Some (List.rev f.P.absents)));
with _ -> ()
) list
@@ -540,7 +535,7 @@
end) s;
begin
try
- let file = query_download [name] (Int64.of_string size)
+ let file = query_download name (Int64.of_string size)
(Md4.of_string md4) None None None false in
let new_file = find_file (Md4.of_string md4) in
CommonInteractive.start_download file;
@@ -570,7 +565,7 @@
name2
in
begin try
- let file = query_download [name] (Int64.of_string size)
+ let file = query_download name (Int64.of_string size)
(Md4.of_string md4) None None None false;
in
CommonInteractive.start_download file;
@@ -924,7 +919,7 @@
(* TODO RESULT *)
"dd", Arg_two(fun size md4 o ->
- let file = query_download [] (Int64.of_string size)
+ let file = query_download md4 (Int64.of_string size)
(Md4.of_string md4) None None None false in
CommonInteractive.start_download file;
"download started"
@@ -1030,7 +1025,6 @@
{ (impl_file_info file.file_file) with
P.file_network = network.network_num;
- P.file_names = file.file_filenames;
P.file_md4 = file.file_md4;
P.file_all_sources =
file.file_sources.DonkeySources.manager_all_sources;
P.file_active_sources =
file.file_sources.DonkeySources.manager_active_sources;
@@ -1187,7 +1181,7 @@
let _ =
file_ops.op_file_save_as <- (fun file name ->
- file.file_filenames <- [name, noips()];
+ add_file_filenames (as_file file) name;
set_file_best_name (as_file file) name "" 0
);
file_ops.op_file_set_format <- (fun file format ->
@@ -1246,9 +1240,9 @@
("", "sr", Printf.sprintf "\\<a href=\\\"%s\\\"\\>%s\\</A\\>" ed2k
ed2k) ];
tr ();
let optionlist = ref "" in
- List.iter (fun (name,_) ->
+ List.iter (fun name ->
optionlist := !optionlist ^ Printf.sprintf "\\<option
value=\\\"%s\\\"\\>%s\n" name name;
- ) file.file_filenames;
+ ) file.file_file.impl_file_filenames;
let input_size = (Printf.sprintf "%d" ((String.length (file_best_name
file))+3)) in
@@ -1465,16 +1459,10 @@
let file_diskname = Filename.concat !!temp_directory filename in
let size = Unix32.getsize file_diskname in
if size <> zero then
- let names =
- (* TODO RESULT
- try DonkeyIndexer.find_names md4
- with _ -> *)
- []
- in
- let _ =
- really_query_download names size md4 None (Some file_diskname) None
- in
+ begin
+ ignore (really_query_download (Md4.to_string md4) size md4 None (Some
file_diskname) None);
recover_md4s md4
+ end
let _ =
network.op_network_extend_search <- (fun s e ->
Index: src/networks/donkey/donkeyShare.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyShare.ml,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- src/networks/donkey/donkeyShare.ml 9 Aug 2006 16:01:27 -0000 1.49
+++ src/networks/donkey/donkeyShare.ml 1 Sep 2006 16:22:15 -0000 1.50
@@ -99,15 +99,11 @@
lprintf_nl "Sharing file with MD4: %s" (Md4.to_string md4);
let file = new_file sh.sh_name FileShared md4 sh.sh_size
- [Filename.basename sh.sh_name, GuiTypes.noips()]
- false in
+ "" false in
must_share_file file codedname old_impl;
file.file_computed_md4s <- md4s;
- let sh_name = Filename.basename sh.sh_name in
- if not (List.mem_assoc sh_name file.file_filenames) then begin
- file.file_filenames <- file.file_filenames @ [sh_name,
GuiTypes.noips()];
+ add_file_filenames (as_file file) (Filename.basename sh.sh_name);
update_best_name file;
- end;
(* file.file_chunks <- Array.make file.file_nchunks PresentVerified; *)
(* file.file_absent_chunks <- []; *)
(* file.file_all_chunks <- String.make file.file_nchunks '1'; *)
Index: src/networks/donkey/donkeyTypes.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyTypes.ml,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- src/networks/donkey/donkeyTypes.ml 16 Aug 2006 19:12:10 -0000 1.43
+++ src/networks/donkey/donkeyTypes.ml 1 Sep 2006 16:22:15 -0000 1.44
@@ -801,7 +801,6 @@
(* mutable file_chunks_age : int array; *)
(* mutable file_all_chunks : string; *)
(* mutable file_absent_chunks : (int64 * int64) list; *)
- mutable file_filenames : (string * GuiTypes.ips_list) list;
(* mutable file_nsources : int; *)
mutable file_computed_md4s : Md4.t array;
mutable file_format : format;
Index: src/networks/fasttrack/fasttrackGlobals.ml
===================================================================
RCS file:
/sources/mldonkey/mldonkey/src/networks/fasttrack/fasttrackGlobals.ml,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- src/networks/fasttrack/fasttrackGlobals.ml 8 Aug 2006 23:55:28 -0000
1.40
+++ src/networks/fasttrack/fasttrackGlobals.ml 1 Sep 2006 16:22:15 -0000
1.41
@@ -285,7 +285,6 @@
file_swarmer = None;
file_searches = [search];
file_uids = [uid];
- file_filenames = [file_name, GuiTypes.noips()];
file_clients_queue = Queues.workflow (fun _ -> false);
file_nconnected_clients = 0;
file_ttr = None;
@@ -298,6 +297,7 @@
impl_file_ops = file_ops;
impl_file_age = last_time ();
impl_file_best_name = file_name;
+ impl_file_filenames = [file_name];
} and search = {
search_search = FileUidSearch (file, file_hash);
search_uid = !search_num;
Index: src/networks/fasttrack/fasttrackHandler.ml
===================================================================
RCS file:
/sources/mldonkey/mldonkey/src/networks/fasttrack/fasttrackHandler.ml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- src/networks/fasttrack/fasttrackHandler.ml 12 May 2006 21:02:38 -0000
1.19
+++ src/networks/fasttrack/fasttrackHandler.ml 1 Sep 2006 16:22:15 -0000
1.20
@@ -198,24 +198,13 @@
CommonInteractive.search_add_result false sss rs
| FileUidSearch (file, file_hash) -> ()
- (*
- let c = new_client user.user_kind in
- add_download file c ()(* (FileByUrl url) *);
-
- if not (List.mem_assoc result_name file.file_filenames) then
- file.file_filenames <- file.file_filenames @ [
- result_name, GuiTypes.noips()] ;
-*)
end;
try
let file = Hashtbl.find files_by_uid meta.M.meta_hash in
let c = new_client fuser.user_kind in
add_download file c ()(* (FileByUrl url) *);
-
- if not (List.mem_assoc result_name file.file_filenames) then
- file.file_filenames <- file.file_filenames @ [
- result_name, GuiTypes.noips()] ;
+ add_file_filenames (as_file file) result_name
with _ -> ()
) results
Index: src/networks/fileTP/fileTPGlobals.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/fileTP/fileTPGlobals.ml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- src/networks/fileTP/fileTPGlobals.ml 8 Aug 2006 23:55:28 -0000
1.27
+++ src/networks/fileTP/fileTPGlobals.ml 1 Sep 2006 16:22:15 -0000
1.28
@@ -148,7 +148,6 @@
(* file_name = file_name; *)
file_clients = [];
file_swarmer = None;
- file_filenames = [Filename.basename file_name, GuiTypes.noips()];
file_clients_queue = Queues.workflow (fun _ -> false);
file_nconnected_clients = 0;
} and file_impl = {
@@ -160,6 +159,7 @@
impl_file_ops = file_ops;
impl_file_age = last_time ();
impl_file_best_name = Filename.basename file_name;
+ impl_file_filenames = [Filename.basename file_name];
}
in
set_file_size file file_size;
Index: src/networks/fileTP/fileTPInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/fileTP/fileTPInteractive.ml,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- src/networks/fileTP/fileTPInteractive.ml 10 Aug 2006 17:41:20 -0000
1.43
+++ src/networks/fileTP/fileTPInteractive.ml 1 Sep 2006 16:22:15 -0000
1.44
@@ -90,7 +90,6 @@
{ (impl_file_info file.file_file) with
P.file_fields = P.Fields_file_info.all;
P.file_network = network.network_num;
- P.file_names = file.file_filenames;
P.file_all_sources = (List.length file.file_clients);
P.file_active_sources = (List.length file.file_clients);
P.file_chunks = (match file.file_swarmer with
Index: src/networks/fileTP/fileTPTypes.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/fileTP/fileTPTypes.ml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- src/networks/fileTP/fileTPTypes.ml 8 Aug 2006 23:55:28 -0000 1.12
+++ src/networks/fileTP/fileTPTypes.ml 1 Sep 2006 16:22:15 -0000 1.13
@@ -49,7 +49,6 @@
(* mutable file_name : string;*)
mutable file_swarmer : CommonSwarming.t option;
mutable file_clients : client list;
- mutable file_filenames : (string * ips_list) list;
mutable file_clients_queue : client Queues.Queue.t;
mutable file_nconnected_clients : int;
}
Index: src/networks/gnutella/gnutellaGlobals.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/gnutella/gnutellaGlobals.ml,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- src/networks/gnutella/gnutellaGlobals.ml 8 Aug 2006 23:55:29 -0000
1.41
+++ src/networks/gnutella/gnutellaGlobals.ml 1 Sep 2006 16:22:15 -0000
1.42
@@ -321,7 +321,6 @@
file_uids = file_uids;
file_swarmer = None;
file_searches = [];
- file_filenames = [file_name, GuiTypes.noips()];
file_clients_queue = Queues.workflow (fun _ -> false);
file_nconnected_clients = 0;
file_ttr = None;
@@ -334,6 +333,7 @@
impl_file_ops = file_ops;
impl_file_age = last_time ();
impl_file_best_name = file_name;
+ impl_file_filenames = [file_name];
}
in
if !verbose then
Index: src/networks/gnutella/gnutellaInteractive.ml
===================================================================
RCS file:
/sources/mldonkey/mldonkey/src/networks/gnutella/gnutellaInteractive.ml,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- src/networks/gnutella/gnutellaInteractive.ml 10 Aug 2006 17:41:20
-0000 1.60
+++ src/networks/gnutella/gnutellaInteractive.ml 1 Sep 2006 16:22:15
-0000 1.61
@@ -299,7 +299,6 @@
file_ops.op_file_info <- (fun file ->
{ (impl_file_info file.file_file) with
P.file_network = network.network_num;
- P.file_names = [file.file_name, P.noips()];
P.file_chunks = (match file.file_swarmer with
| None -> None
Index: src/networks/gnutella/gnutellaTypes.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/gnutella/gnutellaTypes.ml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- src/networks/gnutella/gnutellaTypes.ml 8 Aug 2006 23:55:29 -0000
1.20
+++ src/networks/gnutella/gnutellaTypes.ml 1 Sep 2006 16:22:15 -0000
1.21
@@ -124,7 +124,6 @@
mutable file_clients : client list;
mutable file_uids : Uid.t list;
mutable file_searches : local_search list;
- mutable file_filenames : (string * ips_list) list;
mutable file_clients_queue : client Queues.Queue.t;
mutable file_nconnected_clients : int;
mutable file_ttr : TigerTree.t array option;
Index: src/networks/opennap/opennapInteractive.ml
===================================================================
RCS file:
/sources/mldonkey/mldonkey/src/networks/opennap/opennapInteractive.ml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- src/networks/opennap/opennapInteractive.ml 10 Apr 2006 19:16:36 -0000
1.23
+++ src/networks/opennap/opennapInteractive.ml 1 Sep 2006 16:22:15 -0000
1.24
@@ -139,7 +139,6 @@
P.file_name = file.file_name;
P.file_num = (file_num file);
P.file_network = network.network_num;
- P.file_names = [file.file_name, P.noips()];
P.file_md4 = file.file_id;
P.file_size = file_size file;
P.file_downloaded = file_downloaded file;
Index: src/networks/soulseek/slskInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/soulseek/slskInteractive.ml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- src/networks/soulseek/slskInteractive.ml 10 Apr 2006 19:16:36 -0000
1.21
+++ src/networks/soulseek/slskInteractive.ml 1 Sep 2006 16:22:15 -0000
1.22
@@ -195,7 +195,6 @@
P.file_name = file_best_name (as_file file.file_file);
P.file_num = (file_num file);
P.file_network = network.network_num;
- P.file_names = [file_best_name (as_file file.file_file), P.noips()];
P.file_md4 = file.file_id;
P.file_size = file_size file;
P.file_downloaded = file_downloaded file;
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/09/01
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...,
mldonkey-commits <=
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/09/03
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/09/03
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/09/04
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/09/05
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/09/05
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/09/14
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/09/14
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/09/16
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/09/16
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/09/19