[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/05/21 07:50:05

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonGlobals.ml 
        src/daemon/driver: driverInteractive.ml 

Log message:
        patch #5117

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.843&tr2=1.844&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonGlobals.ml.diff?tr1=1.64&tr2=1.65&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml.diff?tr1=1.77&tr2=1.78&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.843 mldonkey/distrib/ChangeLog:1.844
--- mldonkey/distrib/ChangeLog:1.843    Sat May 20 20:10:50 2006
+++ mldonkey/distrib/ChangeLog  Sun May 21 07:50:04 2006
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/05/21
+5117: Telnet: replace "avail" by "last seen"/fix non-ASCII-filename column 
width
+
 2006/05/20
 5118: Log: Correct prefix for donkeyClient.ml
 5116: HTML: Fix javascript popup in search results for Opera (dextarr)
Index: mldonkey/src/daemon/common/commonGlobals.ml
diff -u mldonkey/src/daemon/common/commonGlobals.ml:1.64 
mldonkey/src/daemon/common/commonGlobals.ml:1.65
--- mldonkey/src/daemon/common/commonGlobals.ml:1.64    Fri May 12 21:08:30 2006
+++ mldonkey/src/daemon/common/commonGlobals.ml Sun May 21 07:50:04 2006
@@ -110,11 +110,12 @@
   (* TODO: we schould change all strings to utf8 when
      they come into the core instead. *)
   let name = Charset.to_utf8 (* String.escaped *) str in
-  let len = String.length name in
+  let len = Charset.utf8_length str in
+  let diff_len_utf8_ascii = (String.length str) - len in
   let max_len = maxi limit 10 in
   if len > max_len then
-    let prefix = String.sub name 0 (max_len -7) in
-    let suffix = String.sub name (len-4) 4 in
+    let prefix = String.sub name 0 (max_len - 7 + diff_len_utf8_ascii) in
+    let suffix = String.sub name (len - 4 + diff_len_utf8_ascii) 4 in
     Printf.sprintf "%s...%s" prefix suffix
   else name
 
Index: mldonkey/src/daemon/driver/driverInteractive.ml
diff -u mldonkey/src/daemon/driver/driverInteractive.ml:1.77 
mldonkey/src/daemon/driver/driverInteractive.ml:1.78
--- mldonkey/src/daemon/driver/driverInteractive.ml:1.77        Sat May 20 
20:01:00 2006
+++ mldonkey/src/daemon/driver/driverInteractive.ml     Sun May 21 07:50:05 2006
@@ -321,7 +321,7 @@
 
 let col_sep = " "
 let add buf s align max_len =
-  let slen = String.length s in
+  let slen = Charset.utf8_length s in
   let diff = max_len - slen in
   match align with
     Align_Center ->
@@ -345,7 +345,7 @@
   List.iter (fun line ->
       let len = Array.length line in
       for i = 0 to len-1 do
-        let slen = String.length line.(i) in
+        let slen = Charset.utf8_length line.(i) in
         if cols.(i) <  slen then cols.(i) <- slen
       done;
   ) (titles :: lines);
@@ -904,7 +904,7 @@
             "    %";
             "    Done";
             "    Size";
-            "Avail";
+            "lSeen";
             "Old";
             " Active";
             "Rate";
@@ -950,7 +950,12 @@
                 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 "%s"
+                (if file.file_last_seen > 0 then
+                   let last = (BasicSocket.last_time ()) - file.file_last_seen 
in
+                     Date.time_to_string last "long"
+                 else "-"
+                ));
               (Printf.sprintf "%d:%s" (age_to_day file.file_age)
                 (
                   let len = Array.length file.file_chunks_age in