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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/10/25 11:14:02

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonComplexOptions.ml 
                           commonComplexOptions.mli commonShared.ml 
        src/daemon/driver: driverCommands.ml 
        src/networks/bittorrent: bTInteractive.ml 
        src/utils/lib  : int64ops.ml 

Log message:
        patch #5485

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1064&r2=1.1065
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonComplexOptions.ml?cvsroot=mldonkey&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonComplexOptions.mli?cvsroot=mldonkey&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonShared.ml?cvsroot=mldonkey&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.187&r2=1.188
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTInteractive.ml?cvsroot=mldonkey&r1=1.118&r2=1.119
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/int64ops.ml?cvsroot=mldonkey&r1=1.3&r2=1.4

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1064
retrieving revision 1.1065
diff -u -b -r1.1064 -r1.1065
--- distrib/ChangeLog   25 Oct 2006 11:12:37 -0000      1.1064
+++ distrib/ChangeLog   25 Oct 2006 11:14:02 -0000      1.1065
@@ -15,6 +15,7 @@
 =========
 
 2006/10/25
+5485: HTML: Print sharing strategies in command "shares"
 5461: Release slot, fix missing filenames in upstats
 - Each downloading file can be set to status "Release", this can
   be done by clicking the "R" column in HTML, Transfers or by

Index: src/daemon/common/commonComplexOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonComplexOptions.ml,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- src/daemon/common/commonComplexOptions.ml   25 Oct 2006 11:12:38 -0000      
1.62
+++ src/daemon/common/commonComplexOptions.ml   25 Oct 2006 11:14:02 -0000      
1.63
@@ -712,7 +712,7 @@
     sharing_directories = false;
     sharing_extensions = [];
     sharing_recursive = false;
-    sharing_minsize = Int64.one;
+    sharing_minsize = zero;
     sharing_maxsize = Int64.max_int;
   }  
   
@@ -721,7 +721,7 @@
     sharing_directories = true;
     sharing_extensions = [];
     sharing_recursive = false;
-    sharing_minsize = Int64.one;
+    sharing_minsize = zero;
     sharing_maxsize = Int64.max_int;
   }  
   
@@ -730,7 +730,7 @@
     sharing_directories = false;
     sharing_extensions = [];
     sharing_recursive = false;
-    sharing_minsize = Int64.one;
+    sharing_minsize = zero;
     sharing_maxsize = Int64.max_int;
   }
 
@@ -739,7 +739,7 @@
       sharing_directories = true;
       sharing_extensions = [];
       sharing_recursive = false;
-      sharing_minsize = Int64.one;
+      sharing_minsize = zero;
       sharing_maxsize = Int64.max_int;
     }
   
@@ -774,7 +774,7 @@
       sharing_directories = false;
       sharing_extensions = [];
       sharing_recursive = true;
-      sharing_minsize = Int64.one;
+      sharing_minsize = zero;
       sharing_maxsize = Int64.max_int;
     };
     
@@ -806,7 +806,7 @@
       
   )
 
-let sharing_strategies name =
+let sharing_strategy name =
   match name with
   | "incoming_files" -> sharing_incoming_files
   | "incoming_directories" -> sharing_incoming_directories

Index: src/daemon/common/commonComplexOptions.mli
===================================================================
RCS file: 
/sources/mldonkey/mldonkey/src/daemon/common/commonComplexOptions.mli,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- src/daemon/common/commonComplexOptions.mli  19 Mar 2006 17:38:08 -0000      
1.17
+++ src/daemon/common/commonComplexOptions.mli  25 Oct 2006 11:14:02 -0000      
1.18
@@ -34,7 +34,8 @@
   (string * CommonTypes.query_entry) list 
 val special_queries : (string * string) list Options.option_record
   
-val sharing_strategies : string -> CommonTypes.sharing_strategy
+val sharing_strategies : (string * CommonTypes.sharing_strategy) list 
Options.option_record
+val sharing_strategy : string -> CommonTypes.sharing_strategy
 
 val shared_directories : 
   CommonTypes.shared_directory list Options.option_record

Index: src/daemon/common/commonShared.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonShared.ml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- src/daemon/common/commonShared.ml   8 Oct 2006 14:20:21 -0000       1.35
+++ src/daemon/common/commonShared.ml   25 Oct 2006 11:14:02 -0000      1.36
@@ -247,7 +247,7 @@
   in
   let dirname = shared_dir.shdir_dirname in
   let strategy = 
-    CommonComplexOptions.sharing_strategies shared_dir.shdir_strategy in
+    CommonComplexOptions.sharing_strategy shared_dir.shdir_strategy in
   let dirname = 
     if Filename.is_relative dirname then
       Filename.concat file_basedir dirname

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -b -r1.187 -r1.188
--- src/daemon/driver/driverCommands.ml 25 Oct 2006 11:12:38 -0000      1.187
+++ src/daemon/driver/driverCommands.ml 25 Oct 2006 11:14:02 -0000      1.188
@@ -2097,7 +2097,7 @@
 \\<table cellspacing=0 cellpadding=0  width=100%%\\>\\<tr\\>
 \\<td class=downloaded width=100%%\\>\\</td\\>
 \\<td nowrap class=\\\"fbig pr\\\"\\>\\<a onclick=\\\"javascript: {
-                   var getdir = prompt('Input: <priority#> <directory> 
(surround dir with quotes if necessary)','0 /home/mldonkey/share')
+                   var getdir = prompt('Input: <priority#> <directory> 
[<strategy>] (surround dir with quotes if necessary)','0 /home/mldonkey/share')
                    parent.fstatus.location.href='submit?q=share+' + 
encodeURIComponent(getdir);
                    setTimeout('window.location.reload()',1000);
                     }\\\"\\>Add Share\\</a\\>
@@ -2116,12 +2116,10 @@
                ( "1", "srh ar", "% free", "% free" ) ;
                ( "0", "srh", "Filesystem", "FS" ) ];
 
-            let counter = ref 0 in
-
+            html_mods_cntr_init ();
             List.iter (fun shared_dir ->
                let dir = shared_dir.shdir_dirname in
-               incr counter;
-               Printf.bprintf buf "\\<tr class=\\\"%s\\\"\\>
+               Printf.bprintf buf "\\<tr class=\\\"dl-%d\\\"\\>
         \\<td title=\\\"Click to unshare this directory\\\"
         onMouseOver=\\\"mOvr(this);\\\"
         onMouseOut=\\\"mOut(this);\\\"
@@ -2136,7 +2134,7 @@
         \\<td class=\\\"sr ar\\\"\\>%s\\</td\\>
         \\<td class=\\\"sr ar\\\"\\>%s\\</td\\>
         \\<td class=\\\"sr\\\"\\>%s\\</td\\>\\</tr\\>"
-               (if !counter mod 2 == 0 then "dl-1" else "dl-2")
+               (html_mods_cntr ())
                (Url.encode dir)
                shared_dir.shdir_priority
                dir
@@ -2155,7 +2153,38 @@
             !!shared_directories;
   
             Printf.bprintf buf 
"\\</table\\>\\</td\\>\\<tr\\>\\</table\\>\\</div\\>\\<P\\>";
-           print_option_help o shared_directories
+           print_option_help o shared_directories;
+            Printf.bprintf buf "\\<P\\>";
+
+           html_mods_big_header_start buf "sharesTable" ["Share strategies"];
+            html_mods_table_header buf "sharesTable" "shares" [
+               ( "0", "srh", "Name", "Name" ) ;
+               ( "0", "srh", "Incoming", "Incoming" ) ;
+               ( "0", "srh", "Directories", "Directories" ) ;
+               ( "0", "srh", "Recursive", "Recursive" ) ;
+               ( "0", "srh", "Minsize", "Minsize" ) ;
+               ( "0", "srh", "Maxsize", "Maxsize" ) ;
+               ( "0", "srh", "Extensions", "Extensions" ) ];
+
+            html_mods_cntr_init ();
+
+           let int64_print v =
+             if v = Int64.max_int then "unlimited" else 
Int64ops.int64_to_human_readable v in
+
+            List.iter (fun (s,t) ->
+                Printf.bprintf buf "\\<tr class=\\\"dl-%d\\\"\\>" 
(html_mods_cntr ());
+                html_mods_td buf [
+                   ("", "sr", s);
+                   ("", "sr", string_of_bool t.sharing_incoming);
+                   ("", "sr", string_of_bool t.sharing_directories);
+                   ("", "sr", string_of_bool t.sharing_recursive);
+                   ("", "sr", (int64_print t.sharing_minsize));
+                   ("", "sr", (int64_print t.sharing_maxsize));
+                   ("", "sr", (String.concat " " t.sharing_extensions));
+                   ];
+                Printf.bprintf buf "\\</tr\\>\n"
+              ) !!sharing_strategies;
+
           end
         else
           begin

Index: src/networks/bittorrent/bTInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- src/networks/bittorrent/bTInteractive.ml    25 Oct 2006 11:12:38 -0000      
1.118
+++ src/networks/bittorrent/bTInteractive.ml    25 Oct 2006 11:14:02 -0000      
1.119
@@ -657,7 +657,7 @@
         match list with
           [] -> raise Not_found
         | sh :: tail ->
-            let s = sharing_strategies sh.shdir_strategy in
+            let s = sharing_strategy sh.shdir_strategy in
             if match torrent.torrent_files with
                 [] -> not s.sharing_directories
               | _ ->  s.sharing_directories then

Index: src/utils/lib/int64ops.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/lib/int64ops.ml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/utils/lib/int64ops.ml   15 Jul 2006 11:52:54 -0000      1.3
+++ src/utils/lib/int64ops.ml   25 Oct 2006 11:14:02 -0000      1.4
@@ -50,3 +50,12 @@
 let round_up64 x y =
   ((Int64.pred (x ++ y)) // y) ** y
 
+let int64_to_human_readable size =
+ if Int64.to_float size >= 1024. && Int64.to_float size < 1048576. then
+    (Printf.sprintf "%5.1f%s" (Int64.to_float size /. 1024.) ("kb") )
+  else if size >= Int64.of_float 1048576. && Int64.to_float size < 1073741824. 
then
+    (Printf.sprintf "%5.1f%s" (Int64.to_float size /. 1048576.) ("mb") )
+  else if size >= Int64.of_float 1073741824. then
+    (Printf.sprintf "%5.1f%s" (Int64.to_float size /. 1073741824.) ("gb") )
+  else
+    (Printf.sprintf "%8s%s" (Int64.to_string size) ("b") )