[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] Changes to mldonkey/src/daemon/driver/driverInteracti
|
From: |
mldonkey-commits |
|
Subject: |
[Mldonkey-commits] Changes to mldonkey/src/daemon/driver/driverInteractive.ml |
|
Date: |
Sun, 10 Jul 2005 19:19:19 -0400 |
Index: mldonkey/src/daemon/driver/driverInteractive.ml
diff -u mldonkey/src/daemon/driver/driverInteractive.ml:1.39
mldonkey/src/daemon/driver/driverInteractive.ml:1.40
--- mldonkey/src/daemon/driver/driverInteractive.ml:1.39 Tue Jul 5
12:26:40 2005
+++ mldonkey/src/daemon/driver/driverInteractive.ml Sun Jul 10 23:19:16 2005
@@ -36,7 +36,7 @@
open CommonTypes
open Int64ops
-
+
(* ripped from gui_downloads *)
let calc_file_eta f =
@@ -60,22 +60,22 @@
else 0.
else rate
in
- let eta =
+ let eta =
if rate < 11.
- then hundays
+ then hundays
else missing /. rate
in
int_of_float eta
end
)
-
+
let file_availability f =
match f.file_availability with
(_,avail) :: _ ->
let rec loop i p n =
if i < 0
- then
+ then
if n < 0.0001
then 0.0
else (p /. n *. 100.0)
@@ -86,14 +86,14 @@
then loop (i - 1) (p +. 1.0) (n +. 1.0)
else loop (i - 1) p (n +. 1.0)
else loop (i - 1) p n
- in
+ in
loop ((String.length avail) - 1) 0.0 0.0
| _ -> 0.0
-
+
let string_availability s =
match s with
(_,s) :: _ ->
-
+
let len = String.length s in
let p = ref 0 in
for i = 0 to len - 1 do
@@ -101,25 +101,25 @@
incr p
end
done;
- if len = 0 then 0.0 else
+ if len = 0 then 0.0 else
(float_of_int !p /. float_of_int len *. 100.)
| _ -> 0.0
-
-let get_file_availability f =
+
+let get_file_availability f =
if !!html_mods_use_relative_availability
- then file_availability f
+ then file_availability f
else string_availability f.file_availability
-
+
(* WARNING: these computations are much more expensive as they seem.
We use the ShortLazy to avoid recomputing the result too many times,
-in particular when sorting the files depending on their number of sources...
+in particular when sorting the files depending on their number of sources...
2004/06/18: file.file_all_sources is used when not zero, and in this case,
also file.file_active_sources.
*)
-
-let number_of_sources gf =
+
+let number_of_sources gf =
List.length (file_all_sources (file_find gf.file_num))
let number_of_sources gf =
@@ -128,7 +128,7 @@
else
ShortLazy.compute ("number_of_sources", gf.file_num, 0)
number_of_sources gf
-
+
let number_of_active_sources gf =
let nasrcs = ref 0 in
List.iter (fun fsrc ->
@@ -139,26 +139,26 @@
!nasrcs
let number_of_active_sources gf =
- if gf.file_all_sources > 0 then
+ if gf.file_all_sources > 0 then
gf.file_active_sources
else begin
ShortLazy.compute ("number_of_active_sources", gf.file_num, 0)
number_of_active_sources gf
- end
-
+ end
+
let net_name gf =
let n = network_find_by_num gf.file_network in
n.network_name
let short_net_name gf =
let nn = net_name gf in
- match nn with
+ match nn with
| "OpenNapster" -> "N"
| "Direct Connect" -> "C"
| "FileTP" -> "T"
- | _ -> String.sub nn 0 1
-
-
+ | _ -> String.sub nn 0 1
+
+
module Html = struct
let begin_td buf = Printf.bprintf buf "\\<td\\>"
let begin_td_option buf option= Printf.bprintf buf "\\<td %s\\>" option
@@ -168,17 +168,17 @@
let end_table buf = Printf.bprintf buf "\\</table\\>"
let begin_tr buf = Printf.bprintf buf "\\<tr\\>"
let end_tr buf = Printf.bprintf buf "\\</tr\\>"
-
+
let button buf value onclick =
Printf.bprintf buf "
\\<input type=\\\"button\\\" value=\\\"%s\\\" onclick=\\\"%s\\\"\\>"
value onclick
end
-
+
let initialization_completed = ref false
let save_config () =
- (try Unix32.flush () with e ->
+ (try Unix32.flush () with e ->
Printf2.lprintf "Exception %s while flushing\n" (Printexc2.to_string e)
);
if !initialization_completed then (
@@ -186,20 +186,20 @@
Options.save_with_help_private users_ini;
CommonComplexOptions.save ();
CommonUploads.save ();
- networks_iter_all (fun r ->
+ networks_iter_all (fun r ->
List.iter (fun opfile ->
- Options.save_with_help opfile
+ Options.save_with_help opfile
) r.network_config_file);
) else (
Printf2.lprintf "Initialization not completed, bypassing state saving\n"
);
()
-
+
let age_to_day date =
(last_time () - date) / Date.day_in_secs
-let percent file =
+let percent file =
let downloaded = Int64.to_float file.file_downloaded in
let size = Int64.to_float file.file_size in
if size < 1.0
@@ -209,7 +209,7 @@
let short_name file =
shorten file.file_name !!max_name_len
-type table_align =
+type table_align =
Align_Left
| Align_Right
| Align_Center
@@ -222,13 +222,13 @@
Align_Center ->
let left = diff / 2 in
let right = diff - left in
- Printf.bprintf buf "%s%s%s"
+ Printf.bprintf buf "%s%s%s"
(String.make left ' ') s (String.make right ' ')
| Align_Right ->
Printf.bprintf buf "%s%s" (String.make diff ' ') s
| Align_Left ->
Printf.bprintf buf "%s%s" s (String.make diff ' ')
-
+
let print_table_text buf alignments titles lines =
let max_cols = ref (max (Array.length titles) (Array.length alignments)) in
List.iter (fun line ->
@@ -239,37 +239,37 @@
let cols = Array.create ncols 0 in
List.iter (fun line ->
let len = Array.length line in
- for i = 0 to len-1 do
+ for i = 0 to len-1 do
let slen = String.length line.(i) in
if cols.(i) < slen then cols.(i) <- slen
done;
) (titles :: lines);
- Array.iteri (fun i s ->
+ Array.iteri (fun i s ->
add buf s Align_Center cols.(i);
Buffer.add_string buf col_sep;
) titles;
Buffer.add_char buf '\n';
let aligns = Array.create ncols Align_Center in
- Array.iteri (fun i al -> aligns.(i) <- al) alignments;
+ Array.iteri (fun i al -> aligns.(i) <- al) alignments;
List.iter (fun line ->
let len = Array.length line in
Array.iteri (fun i s ->
add buf s aligns.(i) cols.(i);
if i+1 < len then Buffer.add_string buf col_sep;
) line;
- Buffer.add_char buf '\n';
+ Buffer.add_char buf '\n';
) lines
-
+
let print_table_html_mods buf lines =
-
+
let counter = ref 0 in
-
+
List.iter (fun line ->
if (!counter mod 2 == 0) then Printf.bprintf buf "\\<tr class=dl-1"
else Printf.bprintf buf "\\<tr class=dl-2";
incr counter;
-
+
Array.iter (fun data ->
Printf.bprintf buf "%s" data;
) line;
@@ -280,12 +280,12 @@
Html.end_tr buf;
Html.end_table buf;
Printf.bprintf buf "\\</div\\>"
-
-
+
+
let print_table_html spacing buf aligns titles lines =
Html.begin_table buf;
-
+
Html.begin_tr buf;
Array.iter (fun title ->
Printf.bprintf buf "\\<td align=center\\>%s\\</td\\>" title;
@@ -293,11 +293,11 @@
) titles;
let naligns = Array.length aligns in
Html.end_tr buf;
-
+
List.iter (fun line ->
Html.begin_tr buf;
Array.iteri (fun i title ->
- Printf.bprintf buf "\\<td%s nowrap\\>%s\\</td\\>"
+ Printf.bprintf buf "\\<td%s nowrap\\>%s\\</td\\>"
(if i >= naligns then "" else
match aligns.(i) with
Align_Center -> " align=center"
@@ -320,11 +320,11 @@
match file.file_state with
| FilePaused | FileQueued -> true
| _ -> false
-
-
+
+
let print_file_html_form buf files =
-
-
+
+
Printf.bprintf buf "
\\<script language=JavaScript\\>\\<!--
function pauseAll(x){for(i=0;i\\<document.selectForm.elements.length;i++){var
j=document.selectForm.elements[i];if (j.name==\\\"pause\\\") {j.checked=x;}}}
@@ -332,53 +332,53 @@
function cancelAll(x){for(i=0;i\\<document.selectForm.elements.length;i++){var
j=document.selectForm.elements[i];if (j.name==\\\"cancel\\\") {j.checked=x;}}}
function
clearAll(x){for(i=0;i\\<document.selectForm.elements.length;i++){var
j=document.selectForm.elements[i];if (j.type==\\\"checkbox\\\")
{j.checked=x;}}}//--\\>\\</script\\>
";
-
+
Printf.bprintf buf "\\<form name=selectForm action=\\\"files\\\"\\>";
-
-
+
+
Html.begin_table_option buf "width=100%";
-
+
Html.begin_td_option buf "width=50%";
Printf.bprintf buf "\\<input type=submit value='Submit changes'\\>";
Html.end_td buf;
-
+
Html.begin_td_option buf "width=50%";
Html.end_td buf;
-
+
Html.begin_td buf;
Html.button buf "Pause all" "pauseAll(true);";
Html.end_td buf;
-
+
Html.begin_td buf;
Html.button buf "Resume all" "resumeAll(true);";
Html.end_td buf;
-
+
Html.begin_td buf;
Html.button buf "Cancel all" "cancelAll(true);";
Html.end_td buf;
-
+
Html.begin_td buf;
Html.button buf "Clear all" "clearAll(false);";
Html.end_td buf;
-
+
Html.end_table buf;
-
- print_table_html 10 buf
- [| Align_Left; Align_Left; Align_Left; Align_Right; Align_Right;
Align_Right; Align_Right; Align_Right|]
+
+ print_table_html 10 buf
+ [| Align_Left; Align_Left; Align_Left; Align_Right; Align_Right;
Align_Right; Align_Right; Align_Right|]
[|
- "[ Num ]";
+ "[ Num ]";
"P/R/C";
- "\\<input type=radio value=File name=sortby\\> File";
- "\\<input type=radio value=Percent name=sortby\\> Percent";
- "\\<input type=radio value=Downloaded name=sortby\\> Downloaded";
- "\\<input type=radio value=Size name=sortby\\> Size";
- "Old";
- "\\<input type=radio value=Rate name=sortby\\> Rate";
- "\\<input type=radio value=Priority name=sortby\\> Priority";
- |]
+ "\\<input type=radio value=File name=sortby\\> File";
+ "\\<input type=radio value=Percent name=sortby\\> Percent";
+ "\\<input type=radio value=Downloaded name=sortby\\> Downloaded";
+ "\\<input type=radio value=Size name=sortby\\> Size";
+ "Old";
+ "\\<input type=radio value=Rate name=sortby\\> Rate";
+ "\\<input type=radio value=Priority name=sortby\\> Priority";
+ |]
(List.map (fun file ->
[|
- (Printf.sprintf "[\\<a
href=\\\"submit\\?q\\=vd+%d\\\"\\>%-5d\\</a\\> \\<a target=_blank
href=http://donkeyfakes.gambri.net/fakecheck/update/fakecheck.php\\?size\\=%s\\&md4=%s\\>%s\\</a\\>]"
+ (Printf.sprintf "[\\<a
href=\\\"submit\\?q\\=vd+%d\\\"\\>%-5d\\</a\\> \\<a target=_blank
href=http://donkeyfakes.gambri.net/fakecheck/update/fakecheck.php\\?size\\=%s\\&md4=%s\\>%s\\</a\\>]"
file.file_num
file.file_num
(Int64.to_string file.file_size)
@@ -387,19 +387,19 @@
);
(if downloading file then
- Printf.sprintf
+ Printf.sprintf
"\\<input name=pause type=checkbox value=%d\\> R
\\<input name=cancel type=checkbox value=%d\\>"
file.file_num
file.file_num
- else
- Printf.sprintf
+ else
+ Printf.sprintf
"P
\\<input name=resume type=checkbox value=%d\\>
\\<input name=cancel type=checkbox value=%d\\>"
file.file_num
file.file_num);
-
+
( let size = Int64.to_float file.file_size in
let downloaded = Int64.to_float file.file_downloaded in
let size = if size < 1. then 1. else size in
@@ -414,15 +414,15 @@
(!!html_vd_barheight)
(truncate ( (1. -. downloaded /. size) *. 100.))
);
-
+
(Printf.sprintf "%5.1f" (percent file));
(Int64.to_string file.file_downloaded);
(Int64.to_string file.file_size);
(Printf.sprintf "%d:%s"
(age_to_day file.file_age)
- (
+ (
let len = Array.length file.file_chunks_age in
- if len = 0 then "-" else
+ if len = 0 then "-" else
let min = ref (last_time ()) in
for i = 0 to len - 1 do
if file.file_chunks_age.(i) < !min then
@@ -430,12 +430,12 @@
done;
if !min = 0 then "-" else
string_of_int (age_to_day !min)));
-
+
(match file.file_state with
| FileQueued -> "Queued"
| FilePaused -> "Paused"
| FileAborted s -> Printf.sprintf "Aborted %s" s
- | _ ->
+ | _ ->
if file.file_download_rate < 10.24 then
"-"
else
@@ -445,9 +445,9 @@
) files);
Printf.bprintf buf "\\</form\\>"
-
+
let print_file_html_mods buf guifiles =
-
+
if (List.length guifiles) > 0 then begin
let tsize = ref Int64.zero in
let tdl = ref Int64.zero in
@@ -456,7 +456,7 @@
let qdl = ref Int64.zero in
let qnum = ref 0 in
- List.iter (fun file ->
+ List.iter (fun file ->
tsize := Int64.add !tsize file.file_size;
tdl := Int64.add !tdl file.file_downloaded;
trate := !trate +. file.file_download_rate;
@@ -468,7 +468,7 @@
end;
) guifiles;
-
+
Printf.bprintf buf "\\</pre\\>
\\<script language=JavaScript\\>\\<!--
function pauseAll(x){for(i=0;i\\<document.selectForm.elements.length;i++){var
j=document.selectForm.elements[i];if (j.name==\\\"pause\\\") {j.checked=x;}}}
@@ -484,7 +484,7 @@
var params='';
if (selectID.value.length \\> 0) {params = '+'+selectID.value+'+'+num;}
var np = selectID.value;
- if (np.charAt(0) == \\\"=\\\") {var p = parseInt(np.substring(1,99));}
+ if (np.charAt(0) == \\\"=\\\") {var p = parseInt(np.substring(1,99));}
else {var p = parseInt(cp) + parseInt(selectID.value);}
var str='\\<select id=\\\"selectPriority' + num + '\\\"
name=\\\"selectPriority' + num + '\\\" style=\\\"font-size: 8px; font-family:
verdana\\\" onchange=\\\"javascript:submitPriority(' + num + ',' + p +
',this)\\\"\\>';
if (p != 20 \\&\\& p != 10 \\&\\& p != 0 \\&\\& p != -10 \\&\\& p !=
-20) { str += '\\<OPTION value=\\\"=' + p + '\\\" SELECTED\\>' + p; }
@@ -506,7 +506,7 @@
\\<div class=main\\>
\\<form id=\\\"selectForm\\\" name=\\\"selectForm\\\" action=\\\"files\\\"\\>
-\\<table class=main cellspacing=0 cellpadding=0\\>
+\\<table class=main cellspacing=0 cellpadding=0\\>
\\<tr\\>\\<td\\>
@@ -538,30 +538,30 @@
Fifo.iter (fun (t,i,num,n,s) -> if t > !last_message_log then incr unread)
chat_message_fifo;
if !unread > 0 then Printf.sprintf "\\<td class=downloaded title=\\\"%d unread
messages\\\"\\>(+%d)\\ \\</td\\>" !unread !unread else "");
-if !!html_mods_vd_network then Printf.bprintf buf
+if !!html_mods_vd_network then Printf.bprintf buf
"\\<td title=\\\"Sort by network\\\" class=dlheader\\>\\<input
style=\\\"padding-left: 0px; padding-right: 0px;\\\" class=headbutton
type=submit value=N name=sortby\\>\\</td\\>";
-Printf.bprintf buf
+Printf.bprintf buf
"\\<td title=\\\"Sort by filename\\\" class=dlheader\\>\\<input
class=headbutton type=submit value=File name=sortby\\>\\</td\\>
\\<td title=\\\"Sort by size\\\" class=dlheader\\>\\<input class=headbutton
type=submit value=Size name=sortby\\>\\</td\\>
\\<td title=\\\"Sort by size downloaded\\\" class=dlheader\\>\\<input
class=\\\"headbutton ar\\\" type=submit value=DLed name=sortby\\>\\</td\\>
\\<td title=\\\"Sort by percent\\\" class=dlheader\\>\\<input class=headbutton
type=submit value=%% name=sortby\\>\\</td\\>
\\<td title=\\\"Sort by number of sources\\\" class=dlheader\\>\\<input
style=\\\"padding-left: 0px; padding-right: 0px;\\\" class=headbutton
type=submit value=Srcs name=sortby\\>\\</td\\>";
-if !!html_mods_vd_active_sources then Printf.bprintf buf
+if !!html_mods_vd_active_sources then Printf.bprintf buf
"\\<td title=\\\"Sort by number of active sources\\\"
class=dlheader\\>\\<input style=\\\"padding-left: 0px; padding-right: 0px;\\\"
class=headbutton type=submit value=A name=sortby\\>\\</td\\>";
-Printf.bprintf buf
+Printf.bprintf buf
"\\<td title=\\\"Sort by file availability percentage (using %s
availability)\\\" class=dlheader\\>\\<input style=\\\"padding-left: 0px;
padding-right: 0px;\\\" class=headbutton type=submit value=Avail
name=sortby\\>\\</td\\>"
(if !!html_mods_use_relative_availability then "Relative" else "Total");
-if !!html_mods_vd_age then Printf.bprintf buf
+if !!html_mods_vd_age then Printf.bprintf buf
"\\<td title=\\\"Sort by age of download\\\" class=dlheader\\>\\<input
style=\\\"padding-left: 0px; padding-right: 0px;\\\" class=headbutton
type=submit value=Age name=sortby\\>\\</td\\>";
-if !!html_mods_vd_last then Printf.bprintf buf
+if !!html_mods_vd_last then Printf.bprintf buf
"\\<td title=\\\"Sort by last seen complete\\\" class=dlheader\\>\\<input
style=\\\"padding-left: 0px; padding-right: 0px;\\\" class=headbutton
type=submit value=Last name=sortby\\>\\</td\\>";
-Printf.bprintf buf
+Printf.bprintf buf
"\\<td title=\\\"Sort by rate\\\" class=dlheader\\>\\<input
style=\\\"padding-left: 0px; padding-right: 0px;\\\" class=headbutton
type=submit value=Rate name=sortby\\>\\</td\\>
\\<td title=\\\"Sort by estimated time of arrival\\\"
class=dlheader\\>\\<input style=\\\"padding-left: 0px; padding-right: 0px;\\\"
class=headbutton type=submit value=ETA name=sortby\\>\\</td\\>";
@@ -569,9 +569,9 @@
Printf.bprintf buf "\\</tr\\>";
-let ctd fn td = Printf.sprintf "\\<td
onClick=\\\"location.href='submit?q=vd+%d';return true;\\\" class=\\\"dl
ar\\\"\\>%s\\</td\\>" fn td in
+let ctd fn td = Printf.sprintf "\\<td
onClick=\\\"location.href='submit?q=vd+%d';return true;\\\" class=\\\"dl
ar\\\"\\>%s\\</td\\>" fn td in
- print_table_html_mods buf
+ print_table_html_mods buf
(List.map (fun file ->
[|
(if downloading file then
@@ -582,7 +582,7 @@
\\<td class=\\\"dl al brs\\\"\\>\\<input class=checkbox
name=cancel type=checkbox value=%d\\>\\</td\\>"
file.file_num
file.file_num
- else
+ else
Printf.sprintf "
onMouseOver=\\\"mOvr(this);return true;\\\"
onMouseOut=\\\"mOut(this);\\\"\\>
\\<td class=\\\"dl al np\\\"\\>P\\</td\\>
@@ -591,15 +591,15 @@
file.file_num
file.file_num);
- (if !!html_mods_vd_network then
- Printf.sprintf "\\<td
onClick=\\\"location.href='submit?q=vd+%d';return true;\\\"
- title=\\\"%s\\\" class=\\\"dl al\\\"\\>%s\\</td\\>"
+ (if !!html_mods_vd_network then
+ Printf.sprintf "\\<td
onClick=\\\"location.href='submit?q=vd+%d';return true;\\\"
+ title=\\\"%s\\\" class=\\\"dl al\\\"\\>%s\\</td\\>"
file.file_num (net_name file) (short_net_name file)
else "");
-
+
( let size = Int64.to_float file.file_size in
let downloaded = Int64.to_float file.file_downloaded in
let size = if size < 1. then 1. else size in
- Printf.sprintf "\\<TD
onClick=\\\"location.href='submit?q=vd+%d';return true;\\\"
+ Printf.sprintf "\\<TD
onClick=\\\"location.href='submit?q=vd+%d';return true;\\\"
title=\\\"[File#: %d] [Net: %s]%s\\\" class=\\\"dl
al\\\"\\>%s\\<br\\>
\\<table cellpadding=0 cellspacing=0
width=100%%\\>\\<tr\\>
\\<td class=\\\"loaded\\\" style=\\\"height:%dpx\\\"
width=\\\"%d%%\\\"\\> \\</td\\>
@@ -614,25 +614,25 @@
(truncate (downloaded /. size *. 100.))
(!!html_vd_barheight)
(truncate ( (1. -. downloaded /. size) *. 100.))
- );
+ );
(ctd file.file_num (size_of_int64 file.file_size));
(ctd file.file_num (size_of_int64 file.file_downloaded));
(ctd file.file_num (Printf.sprintf "%.1f" (percent file)));
(ctd file.file_num (Printf.sprintf "%d" (number_of_sources file)));
- (if !!html_mods_vd_active_sources then
+ (if !!html_mods_vd_active_sources then
ctd file.file_num (Printf.sprintf "%d" (number_of_active_sources
file))
else "");
- (ctd file.file_num (Printf.sprintf "%.0f" (get_file_availability
file)));
+ (ctd file.file_num (Printf.sprintf "%.0f" (get_file_availability
file)));
- (if !!html_mods_vd_age then
+ (if !!html_mods_vd_age then
ctd file.file_num (let age = (BasicSocket.last_time ())
- file.file_age in time_to_string age)
else "");
- (if !!html_mods_vd_last then
+ (if !!html_mods_vd_last then
ctd file.file_num (if file.file_last_seen > 0
then let last = (BasicSocket.last_time ()) - file.file_last_seen
in
time_to_string last
@@ -640,9 +640,9 @@
)
else ""
);
-
+
(ctd file.file_num
- (match file.file_state with
+ (match file.file_state with
FilePaused -> "Paused"
| FileQueued -> "Queued"
| _ -> if file.file_download_rate < 10.24 then "-"
@@ -650,12 +650,12 @@
)
);
- (ctd file.file_num (if (file.file_download_rate < 10.24 || stalled
file) then "-"
+ (ctd file.file_num (if (file.file_download_rate < 10.24 || stalled
file) then "-"
else time_to_string (calc_file_eta file)) );
- (if !!html_mods_vd_prio then
- (Printf.sprintf "\\<td class=\\\"dl ar\\\"\\>\\<div
id=\\\"divSelectPriority%d\\\"\\>\\<select id=\\\"selectPriority%d\\\"
name=\\\"selectPriority%d\\\"
- style=\\\"font-size: 8px; font-family: verdana\\\"
onchange=\\\"javascript:submitPriority(%d,%d,this)\\\"\\>\n"
+ (if !!html_mods_vd_prio then
+ (Printf.sprintf "\\<td class=\\\"dl ar\\\"\\>\\<div
id=\\\"divSelectPriority%d\\\"\\>\\<select id=\\\"selectPriority%d\\\"
name=\\\"selectPriority%d\\\"
+ style=\\\"font-size: 8px; font-family: verdana\\\"
onchange=\\\"javascript:submitPriority(%d,%d,this)\\\"\\>\n"
file.file_num file.file_num file.file_num file.file_num
file.file_priority)
^ (match file.file_priority with 0 | -10 | 10 | -20 |
20 -> "" | _ ->
Printf.sprintf "\\<option value=\\\"=%d\\\"
SELECTED\\>%d\n" file.file_priority file.file_priority)
@@ -708,9 +708,9 @@
\\</tr\\>
" (List.length files);
-
-
- print_table_html_mods buf
+
+
+ print_table_html_mods buf
(List.map (fun file ->
[|
@@ -734,7 +734,7 @@
else if size > Int64.of_float 1073741824. then
(Printf.sprintf "%5.1f%s" (Int64.to_float size /. 1073741824.) ("gb") )
else if size < Int64.zero then
- (Printf.sprintf "%d chunks"
+ (Printf.sprintf "%d chunks"
((String.length file.file_chunks)-(String.length (String2.replace
(String2.replace file.file_chunks '0' "") '1' ""))))
else (Printf.sprintf "%8s%s" (Int64.to_string size) ("b") ) )
@@ -746,28 +746,28 @@
begin
if !!html_mods then print_file_html_mods buf files
else
- print_file_html_form buf files
+ print_file_html_form buf files
end
else
- print_table buf
- [|
- Align_Left; Align_Left; Align_Right; Align_Right;
- Align_Right; Align_Right; Align_Right |]
+ print_table buf
+ [|
+ Align_Left; Align_Left; Align_Right; Align_Right;
+ Align_Right; Align_Right; Align_Right |]
(if format.conn_output = HTML then
[|
- "[ Num ]";
- "\\<a href=\\\"submit\\?q\\=vd\\&sortby\\=name\\\"\\> File
\\</a\\>";
- "\\<a href=\\\"submit\\?q\\=vd\\&sortby\\=percent\\\"\\> Percent
\\</a\\>";
+ "[ Num ]";
+ "\\<a href=\\\"submit\\?q\\=vd\\&sortby\\=name\\\"\\> File
\\</a\\>";
+ "\\<a href=\\\"submit\\?q\\=vd\\&sortby\\=percent\\\"\\> Percent
\\</a\\>";
"\\<a href=\\\"submit\\?q\\=vd\\&sortby\\=done\\\"\\> Downloaded
\\</a\\>";
- "\\<a href=\\\"submit\\?q\\=vd\\&sortby\\=size\\\"\\> Size
\\</a\\>";
+ "\\<a href=\\\"submit\\?q\\=vd\\&sortby\\=size\\\"\\> Size
\\</a\\>";
"Old";
- "\\<a href=\\\"submit\\?q\\=vd\\&sortby\\=rate\\\"\\> Rate
\\</a\\>";
- "\\<a href=\\\"submit\\?q\\=vd\\&sortby\\=priority\\\"\\> Priority
\\</a\\>";
+ "\\<a href=\\\"submit\\?q\\=vd\\&sortby\\=rate\\\"\\> Rate
\\</a\\>";
+ "\\<a href=\\\"submit\\?q\\=vd\\&sortby\\=priority\\\"\\> Priority
\\</a\\>";
|] else
[|
- "$nNum";
+ "$nNum";
"File";
- " %";
+ " %";
" Done";
" Size";
"Avail";
@@ -775,7 +775,7 @@
" Active";
"Rate";
"Prio";
- |]
+ |]
)
(List.map (fun file ->
let rate, color =
@@ -794,7 +794,7 @@
(Printf.sprintf "%0s[%0s]%0s"
(if !!term_ansi then (color)
else "")
- (if format.conn_output = HTML then
+ (if format.conn_output = HTML then
(Printf.sprintf "\\<a href=\\\"submit\\?q\\=vd\\+%d\\\"
$S\\>%0s%4d\\</a\\>"
file.file_num
(short_net_name file)
@@ -803,10 +803,10 @@
(Printf.sprintf "%0s%4d"
(short_net_name file)
file.file_num))
- (if format.conn_output = HTML then
- Printf.sprintf "[\\<a
href=\\\"submit\\?q\\=cancel\\+%d\\\" $S\\>CANCEL\\</a\\>][\\<a
href=\\\"submit\\?q\\=%s\\+%d\\\" $S\\>%s\\</a\\>] "
+ (if format.conn_output = HTML then
+ Printf.sprintf "[\\<a
href=\\\"submit\\?q\\=cancel\\+%d\\\" $S\\>CANCEL\\</a\\>][\\<a
href=\\\"submit\\?q\\=%s\\+%d\\\" $S\\>%s\\</a\\>] "
file.file_num
- (if downloading file then "pause" else "resume" )
+ (if downloading file then "pause" else "resume" )
file.file_num
(if downloading file then "PAUSE" else "RESUME")
else ""));
@@ -816,11 +816,11 @@
else (Int64.to_string file.file_downloaded) );
(if !!improved_telnet then (print_human_readable file
file.file_size)
else (Int64.to_string file.file_size) );
- (Printf.sprintf "%.0f%%" (get_file_availability file));
+ (Printf.sprintf "%.0f%%" (get_file_availability file));
(Printf.sprintf "%d:%s" (age_to_day file.file_age)
- (
+ (
let len = Array.length file.file_chunks_age in
- if len = 0 then "-" else
+ if len = 0 then "-" else
let min = ref (last_time ()) in
for i = 0 to len - 1 do
if file.file_chunks_age.(i) < !min then
@@ -834,42 +834,42 @@
|]
) files)
else
- if use_html_mods format then
+ if use_html_mods format then
html_mods_done_files buf files
else
-
- print_table buf
- [||]
+
+ print_table buf
+ [||]
(if format.conn_output = HTML then
[|
- "[ Num ]";
- "\\<a href=\\\"submit\\?q\\=vd\\&sortby\\=name\\\"\\> File
\\</a\\>";
- "\\<a href=\\\"submit\\?q\\=vd\\&sortby\\=size\\\"\\> Size
\\</a\\>";
- "MD4";
- |]
+ "[ Num ]";
+ "\\<a href=\\\"submit\\?q\\=vd\\&sortby\\=name\\\"\\> File \\</a\\>";
+ "\\<a href=\\\"submit\\?q\\=vd\\&sortby\\=size\\\"\\> Size \\</a\\>";
+ "MD4";
+ |]
else
[|
- "[ Num ]";
- "File";
- "Size";
- "MD4";
- |]
+ "[ Num ]";
+ "File";
+ "Size";
+ "MD4";
+ |]
)
(List.map (fun file ->
[|
- (Printf.sprintf "[%s %-5d]"
- (net_name file)
+ (Printf.sprintf "[%s %-5d]"
+ (net_name file)
file.file_num);
(short_name file);
(Int64.to_string file.file_size);
(Md4.to_string file.file_md4)
|]
) files)
-
+
let display_file_list buf o =
display_vd := true;
if not (use_html_mods o) then
-(* Printf.bprintf buf "Downloaded %d/%d files\n" (List.length !!done_files)
+(* Printf.bprintf buf "Downloaded %d/%d files\n" (List.length !!done_files)
(List.length !!files); *)
Printf.bprintf buf "\nDown: %.1f KB/s ( %d + %d ) | Up: %.1f KB/s ( %d +
%d ) | Shared: %d/%s"
(( (float_of_int !udp_download_rate) +. (float_of_int
!control_download_rate)) /. 1024.0)
@@ -891,13 +891,13 @@
end
else
let list = List2.tail_map file_info !!files in
- let list =
+ let list =
try
let sorter =
match o.conn_sortvd with
-
+
| BySize -> (fun f1 f2 -> f1.file_size >= f2.file_size)
- | ByRate -> (fun f1 f2 ->
+ | ByRate -> (fun f1 f2 ->
if stalled f1 then false else
if stalled f2 then true else
f1.file_download_rate >= f2.file_download_rate
@@ -939,64 +939,64 @@
let get_tag_value tag =
- match tag.tag_value with
+ match tag.tag_value with
| Uint64 i -> String.escaped (Int64.to_string i)
| Fint64 i -> String.escaped (Int64.to_string i)
| String s -> String.escaped s
| _ -> ""
-let old_print_search buf o results =
+let old_print_search buf o results =
let user = o.conn_user in
let counter = ref 0 in
- if use_html_mods o then
- html_mods_table_header buf "resultsTable" "results" [
- ( "0", "srh", "Network", "Network" ) ;
- ( "0", "srh", "File", "File (mouseover)" ) ;
- ( "1", "srh ar", "Size", "Size" ) ;
- ( "1", "srh ar", "Availability", "A" ) ;
- ( "1", "srh ar", "Complete Sources", "C" ) ;
- ( "0", "srh", "Hash (click for bitzi lookup)", "Hash (bitzi click)" ) ;
- ( "0", "srh", "Tags", "Tags (mouseover)" ) ] ;
-
+ if use_html_mods o then
+ html_mods_table_header buf "resultsTable" "results" [
+ ( "0", "srh", "Network", "Network" ) ;
+ ( "0", "srh", "File", "File (mouseover)" ) ;
+ ( "1", "srh ar", "Size", "Size" ) ;
+ ( "1", "srh ar", "Availability", "A" ) ;
+ ( "1", "srh ar", "Complete Sources", "C" ) ;
+ ( "0", "srh", "Hash (click for bitzi lookup)", "Hash (bitzi click)" ) ;
+ ( "0", "srh", "Tags", "Tags (mouseover)" ) ] ;
+
(try
List.iter (fun (rs,r,avail) ->
if !!display_downloaded_results || not r.result_done then begin
incr counter;
- if !counter >= !!max_displayed_results then raise Exit;
-
+ if !counter >= !!max_displayed_results then raise Exit;
+
if use_html_mods o then
begin
if (!counter mod 2 == 0) then Printf.bprintf buf "\\<tr
class=\\\"dl-1\\\"\\>"
else Printf.bprintf buf "\\<tr class=\\\"dl-2\\\"\\>";
end;
-
+
user.ui_last_results <- (!counter, rs) :: user.ui_last_results;
if use_html_mods o then Printf.bprintf buf "\\<td
class=\\\"sr\\\"\\>%s\\</td\\>"
(
(* TODO RESULT: use the uids to display from which networks it is downloadable
let n = network_find_by_num r.result_network in
n.network_name *) "--")
- else Printf.bprintf buf "[%5d] %s "
+ else Printf.bprintf buf "[%5d] %s "
!counter
(* TODO RESULT:
(let n = network_find_by_num r.result_network in
n.network_name) *)
"--";
-
+
if o.conn_output = HTML then begin
if !!html_mods then begin
Printf.bprintf buf "\\<td title=\\\"";
let nl = ref false in
List.iter (fun t ->
match t.tag_name with
- | Field_UNKNOWN "FTH" | Field_UNKNOWN "urn" -> ()
- | _ ->
- Buffer.add_string buf ((if !nl then "\n" else
begin nl := true;"" end) ^
- "|| (" ^
+ | Field_UNKNOWN "FTH" | Field_UNKNOWN "urn" -> ()
+ | _ ->
+ Buffer.add_string buf ((if !nl then "\n" else
begin nl := true;"" end) ^
+ "|| (" ^
escaped_string_of_field t ^ "): " ^
get_tag_value t);
) r.result_tags;
-
+
Printf.bprintf buf "\\\" class=\\\"sr\\\"\\>\\<a
href=results\\?d=%d target=\\\"$S\\\"\\>" r.result_num
end
else Printf.bprintf buf "\\<a href=results\\?d=%d $S\\>"
r.result_num;
@@ -1006,12 +1006,12 @@
[] -> ()
| name :: names ->
Printf.bprintf buf "%s\n" (shorten name !!max_name_len);
- List.iter (fun s ->
+ List.iter (fun s ->
if use_html_mods o then Printf.bprintf buf "\\<BR\\>";
Printf.bprintf buf " %s\n" s
) names;
end;
- if r.result_done then
+ if r.result_done then
begin
if use_html_mods o then Printf.bprintf buf "\\<BR\\>";
Printf.bprintf buf " ALREADY DOWNLOADED\n "
@@ -1024,7 +1024,7 @@
Printf.bprintf buf "COMMENT: %s\n" comment
end;
end;
- if o.conn_output = HTML then
+ if o.conn_output = HTML then
begin
if !!html_mods then Printf.bprintf buf "\\</a\\>\\</td\\>"
else Printf.bprintf buf "\\</a href\\>";
@@ -1033,14 +1033,14 @@
let cavail = ref (string_of_int avail) in
let csource = ref "" in
List.iter (fun t ->
- (match t.tag_name with
+ (match t.tag_name with
| Field_UNKNOWN "urn"
| Field_UNKNOWN "FTH" -> hash := get_tag_value t
| Field_Availability -> cavail := get_tag_value t
| Field_Completesources -> csource := get_tag_value t
| _ -> ())) r.result_tags;
-
- if use_html_mods o then
+
+ if use_html_mods o then
Printf.bprintf buf "\\<td class=\\\"sr ar\\\"\\>%s\\</td\\>
\\<td class=\\\"sr ar\\\"\\>%s\\</td\\>
\\<td class=\\\"sr ar\\\"\\>%s\\</td\\>
@@ -1048,29 +1048,29 @@
(size_of_int64 r.result_size)
!cavail
!csource
-
+
(if String.contains !hash ':' then
- String.sub !hash
+ String.sub !hash
((String.rindex !hash ':')+1)
((String.length !hash) - (String.rindex !hash ':') - 1)
else !hash) !hash
- else Printf.bprintf buf " %10s %10s "
+ else Printf.bprintf buf " %10s %10s "
(Int64.to_string r.result_size)
(string_of_uids r.result_uids);
-
- if use_html_mods o then begin
+
+ if use_html_mods o then begin
Printf.bprintf buf "\\<td class=\\\"sr\\\"\\>";
List.iter (fun t ->
- (match t.tag_name with
+ (match t.tag_name with
| Field_Completesources
| Field_Availability
(* TODO : "urn" shouldn't be some kind of Field_Uid of Gnutella ? *)
- | Field_UNKNOWN "urn"
+ | Field_UNKNOWN "urn"
(* TODO : "FTH" shouldn't be some kind of Field_Uid of Fasttrack ? *)
- | Field_UNKNOWN "FTH" -> ()
- | _ ->
- Buffer.add_string buf ("\\<span title=\\\"" ^
- get_tag_value t ^ "\\\"\\>(" ^
+ | Field_UNKNOWN "FTH" -> ()
+ | _ ->
+ Buffer.add_string buf ("\\<span title=\\\"" ^
+ get_tag_value t ^ "\\\"\\>(" ^
escaped_string_of_field t ^ ") \\</span\\>");
)
) r.result_tags;
@@ -1087,24 +1087,24 @@
) results;
if use_html_mods o then Printf.bprintf buf "\\</table\\>"
with _ -> ())
-
-
-let add_filter_table buf search_num =
+
+
+let add_filter_table buf search_num =
Printf.bprintf buf "\\<form action=\\\"filter\\\"\\>";
Printf.bprintf buf "\\<input type=hidden name=num value=%d\\>" search_num;
-
+
Printf.bprintf buf "\\<table\\>";
Printf.bprintf buf "\\<tr\\>";
-
+
Printf.bprintf buf "\\<td\\>";
Printf.bprintf buf "\\<input type=submit value='Filter Out'\\>";
Printf.bprintf buf "\\</td\\>";
Printf.bprintf buf "\\</tr\\>\\<tr\\>";
-
+
Printf.bprintf buf "\\<td\\>\\<table\\>\\<tr\\>";
-
+
Printf.bprintf buf "\\<table\\>";
Printf.bprintf buf "\\<td\\> Media: \\</td\\>";
Printf.bprintf buf "\\<td\\>\\<input name=media type=checkbox value=Audio\\>
Audio \\</td\\>";
@@ -1114,7 +1114,7 @@
Printf.bprintf buf "\\</table\\>";
Printf.bprintf buf "\\</tr\\>\\<tr\\>";
-
+
Printf.bprintf buf "\\<table\\>";
Printf.bprintf buf "\\<td\\> Formats: \\</td\\>";
Printf.bprintf buf "\\<td\\>\\<input name=format type=checkbox value=mp3\\>
Mp3 \\</td\\>";
@@ -1124,7 +1124,7 @@
Printf.bprintf buf "\\</table\\>";
Printf.bprintf buf "\\</tr\\>\\<tr\\>";
-
+
Printf.bprintf buf "\\<table\\>";
Printf.bprintf buf "\\<td\\> Sizes: \\</td\\>";
Printf.bprintf buf "\\<td\\>\\<input name=size type=checkbox value=0to5\\>
0/5 MB \\</td\\>";
@@ -1137,23 +1137,23 @@
Printf.bprintf buf "\\</tr\\>";
Printf.bprintf buf "\\</table\\>";
-
+
Printf.bprintf buf "\\</form\\>"
-
+
(* with checkboxes *)
-let print_search_html buf results o search_num =
+let print_search_html buf results o search_num =
let user = o.conn_user in
let counter = ref 0 in
-
+
let files = ref [] in
-
+
(try
List.iter (fun (rs, r, avail) ->
try
o.conn_filter r;
- if !!display_downloaded_results || not r.result_done then
- let tags_string =
+ if !!display_downloaded_results || not r.result_done then
+ let tags_string =
let buf = Buffer.create 100 in
List.iter (fun t ->
Buffer.add_string buf (Printf.sprintf "%-3s "
@@ -1171,50 +1171,50 @@
if !counter >= !!max_displayed_results then raise Exit;
user.ui_last_results <- (!counter, rs) :: user.ui_last_results;
files := [|
-
+
(Int64.to_string r.result_size);
(string_of_int avail);
(Printf.sprintf "[%5d]\\<input name=d type=checkbox
value=%d\\>" !counter r.result_num);
-
+
(
let names = r.result_names in
let names = if r.result_done then
names @ ["ALREADY DOWNLOADED"] else names in
let names = match r.result_comment with
- | "" -> names
+ | "" -> names
| comment ->
- names @ ["COMMENT: " ^ comment]
+ names @ ["COMMENT: " ^ comment]
in
match names with
[name] -> name
| _ ->
let buf = Buffer.create 100 in
Buffer.add_string buf "\\<table\\>\n";
- List.iter (fun s ->
+ List.iter (fun s ->
Buffer.add_string buf "\\<tr\\>\\<td\\>";
Buffer.add_string buf s;
Buffer.add_string buf "\\</td\\>\\</tr\\>";
) names;
Buffer.add_string buf "\\</table\\>\n";
-
+
Buffer.contents buf
);
-
+
tags_string;
-
-
+
+
(string_of_uids r.result_uids);
|] :: !files
with _ -> ()
) results;
with _ -> ());
-
+
if !counter > !!filter_table_threshold then
add_filter_table buf search_num;
-
+
Printf.bprintf buf "\\<form action=results\\>";
Printf.bprintf buf "\\<input type=submit value='Submit Changes'\\>";
- print_table_html 10 buf [||]
+ print_table_html 10 buf [||]
[|
"[ Num ]";
"Size";
@@ -1222,18 +1222,18 @@
"Names";
"Tags";
"MD4";
- |]
+ |]
(List.rev !files);
- Printf.bprintf buf "\\</form\\>"
+ Printf.bprintf buf "\\</form\\>"
+
+
-
-
let print_results stime buf o results =
-
+
let user = o.conn_user in
let print_table = if o.conn_output = HTML then print_table_html 2
else print_table_text in
-
+
let counter = ref 0 in
let nsources = ref 0 in
let totalsize = ref 0L in
@@ -1248,32 +1248,32 @@
user.ui_last_results <- (!counter, rs) :: user.ui_last_results;
let new_result = !!save_results > 0 && r.result_time >= stime in
files := [|
-
+
(if use_html_mods o then
Printf.sprintf "\\>\\<td class=\\\"sr\\\"\\>%d\\</td\\>"
!counter
- else Printf.sprintf "%s[%s%5d]"
+ else Printf.sprintf "%s[%s%5d]"
(if new_result && !!term_ansi then "$b" else "$n")
(if new_result then "N" else " ")
!counter);
-
-
- (if use_html_mods o then
+
+
+ (if use_html_mods o then
"\\<td class=\\\"sr ar\\\"\\>" ^ size_of_int64
r.result_size ^ "\\</td\\>"
else Int64.to_string r.result_size
);
-
- (if use_html_mods o then
+
+ (if use_html_mods o then
"\\<td class=\\\"sr ar\\\"\\>" ^ (string_of_int avail) ^
"\\</td\\>"
else (string_of_int avail)
);
-
+
(Printf.sprintf "%s%s%s"
(if o.conn_output = HTML then begin
if !!html_mods then Printf.sprintf "\\<td
class=\\\"sr\\\"\\>\\<a href=results\\?d=%d target=\\\"$S\\\"\\>" r.result_num
else Printf.sprintf "\\<a href=results\\?d=%d $S\\>"
r.result_num;
end
else "")
-
+
( shorten (
let names = r.result_names in
let names = if r.result_done then
@@ -1281,36 +1281,36 @@
let names = match r.result_comment with
"" -> names
| comment ->
- names @ ["COMMENT: " ^ comment]
+ names @ ["COMMENT: " ^ comment]
in
match names with
[name] -> name
| _ ->
let buf = Buffer.create 100 in
if o.conn_output = HTML then Buffer.add_string buf
"\\<table\\>\n";
- List.iter (fun s ->
+ List.iter (fun s ->
if o.conn_output = HTML then Buffer.add_string
buf "\\<tr\\>";
Buffer.add_string buf s;
if o.conn_output = HTML then Buffer.add_string
buf "\\</tr\\>";
) names;
if o.conn_output = HTML then Buffer.add_string buf
"\\</table\\>\n";
-
+
Buffer.contents buf
) !!max_name_len)
- (if o.conn_output = HTML then
+ (if o.conn_output = HTML then
begin
if !!html_mods then "\\</a\\>\\</td\\>"
- else "\\</a href\\>"
+ else "\\</a href\\>"
end
else ""
)
);
-
-
+
+
(let buf = Buffer.create 100 in
-
+
if use_html_mods o then Buffer.add_string buf "\\<td
class=\\\"sr\\\"\\>";
-
+
List.iter (fun t ->
Buffer.add_string buf (Printf.sprintf "%-3s "
(if t.tag_name = Field_Availability then "" else
@@ -1322,14 +1322,14 @@
))
) r.result_tags;
Buffer.contents buf);
-
+
(
let uid = string_of_uids r.result_uids in
- if use_html_mods o then
+ if use_html_mods o then
Printf.sprintf "\\<td class=\\\"sr\\\"\\>%s\\</td\\>" uid
else uid
);
-
+
|] :: !files;
end
) results;
@@ -1337,22 +1337,22 @@
if use_html_mods o then
begin
- html_mods_table_header buf "resultsTable" "results" [
- ( "1", "srh", "Number", "#" ) ;
- ( "1", "srh ar", "Size", "Size" ) ;
- ( "0", "srh ar", "Availability", "A" ) ;
- ( "0", "srh", "Filename", "Name" ) ;
- ( "0", "srh", "Tag", "Tag" ) ;
- ( "0", "srh", "MD4", "MD4" ) ];
-
+ html_mods_table_header buf "resultsTable" "results" [
+ ( "1", "srh", "Number", "#" ) ;
+ ( "1", "srh ar", "Size", "Size" ) ;
+ ( "0", "srh ar", "Availability", "A" ) ;
+ ( "0", "srh", "Filename", "Name" ) ;
+ ( "0", "srh", "Tag", "Tag" ) ;
+ ( "0", "srh", "MD4", "MD4" ) ];
+
print_table_html_mods buf
(List.rev !files)
-
+
end
-
+
else
-
- print_table buf [| Align_Left; Align_Right; Align_Right; Align_Left;
Align_Left; Align_Left|]
+
+ print_table buf [| Align_Left; Align_Right; Align_Right; Align_Left;
Align_Left; Align_Left|]
[|
"[ Num ]";
"Size";
@@ -1360,13 +1360,13 @@
"Names";
"Tags";
"MD4";
- |]
-
+ |]
+
(List.rev !files);
Printf.bprintf buf "%d sources, total available %s\n" !nsources
(size_of_int64 !totalsize)
-
-
-let print_search buf s o =
+
+
+let print_search buf s o =
let user = o.conn_user in
user.ui_last_search <- Some s;
user.ui_last_results <- [];
@@ -1377,20 +1377,20 @@
let results = Sort.list (fun (_, r1,_) (_, r2,_) ->
r1.result_size > r2.result_size
) !results in
-
+
Printf.bprintf buf "Result of search %d\n" s.search_num;
Printf.bprintf buf "Reinitialising download selectors\n";
- Printf.bprintf buf "%d results (%s)\n" s.search_nresults
+ Printf.bprintf buf "%d results (%s)\n" s.search_nresults
(if s.search_waiting = 0 then "done" else
(string_of_int s.search_waiting) ^ " waiting");
-
+
if o.conn_output != HTML then print_results s.search_time buf o results else
begin
if !!html_checkbox_search_file_list then
print_search_html buf results o s.search_num
else
- old_print_search buf o results
- end
+ old_print_search buf o results
+ end
let browse_friends () =
List.iter (fun c -> client_browse c false) !!friends;
@@ -1419,9 +1419,9 @@
networks_iter_all
(fun n ->
- if not (List.mem VirtualNetwork n.network_flags) then
+ if not (List.mem VirtualNetwork n.network_flags) then
try
- let net_has e = if List.mem e n.network_flags then "yes" else ""
in
+ let net_has e = if List.mem e n.network_flags then "yes" else ""
in
Printf.bprintf buf "\\<tr class=\\\"dl-%d\\\"\\>"
(html_mods_cntr ());
html_mods_td buf [
("", "sr br", n.network_name);
@@ -1440,7 +1440,7 @@
html_mods_table_header buf "networkTable" "networkInfo" [];
Printf.bprintf buf "\\<tr class=\\\"dl-%d\\\"\\>" (html_mods_cntr ());
html_mods_td buf [
- ("", "sr br",
+ ("", "sr br",
"This table prints information about the capabilities of\nMLDonkey
network modules, not the networks themselves"); ];
Printf.bprintf buf "\\</table\\>\\</div\\>\\</div\\>\n"
end
- [Mldonkey-commits] Changes to mldonkey/src/daemon/driver/driverInteractive.ml, mldonkey-commits, 2005/07/05
- [Mldonkey-commits] Changes to mldonkey/src/daemon/driver/driverInteractive.ml,
mldonkey-commits <=
- [Mldonkey-commits] Changes to mldonkey/src/daemon/driver/driverInteractive.ml, mldonkey-commits, 2005/07/14
- [Mldonkey-commits] Changes to mldonkey/src/daemon/driver/driverInteractive.ml, mldonkey-commits, 2005/07/17
- [Mldonkey-commits] Changes to mldonkey/src/daemon/driver/driverInteractive.ml, mldonkey-commits, 2005/07/17
- [Mldonkey-commits] Changes to mldonkey/src/daemon/driver/driverInteractive.ml, mldonkey-commits, 2005/07/19
- [Mldonkey-commits] Changes to mldonkey/src/daemon/driver/driverInteractive.ml, mldonkey-commits, 2005/07/20
- [Mldonkey-commits] Changes to mldonkey/src/daemon/driver/driverInteractive.ml, mldonkey-commits, 2005/07/28