Changeset 8590

Timestamp:

10/03/09 12:17:21 (2 years ago)

Author:

Sewi

Message:

Beautify output

Location:

trunk/Padre

Files:

• Makefile.PL (modified) (2 diffs)
• lib/Padre/Util.pm (modified) (1 diff)

trunk/Padre/Makefile.PL

@@ -56 +56 @@
 requires 'File::Remove'             => '1.42';
 requires 'File::ShareDir'           => '1.00';
-
 #requires      'File::ShareDir::PAR'      => '0.04';
 requires 'File::Spec'            => '3.2701';
@@ -62 +61 @@
 requires 'File::Which'           => '1.08';
 requires 'FindBin'               => 0;
+requires 'Format::Human::Bytes'  => 0;
 requires 'Getopt::Long'          => 0;
 requires 'HTML::Entities'        => '3.57';

trunk/Padre/lib/Padre/Util.pm

@@ -486 +486 @@
 
 sub humanbytes {
+    
     my $Bytes = $_[0] || 0;
-    if    ( $Bytes > 8192000000000 ) { return int( $Bytes / 1099511627776 ) . "TB"; }
-    elsif ( $Bytes > 8192000000 )    { return int( $Bytes / 1073741824 ) . "GB"; }
-    elsif ( $Bytes > 8192000 )       { return int( $Bytes / 1048576 ) . "MB"; }
-    elsif ( $Bytes > 8192 )          { return int( $Bytes / 1024 ) . "kB"; }
-    elsif ( $Bytes == 0 )            { return "0"; }
-    else                             { return $Bytes . "B"; }
+    
+    eval {
+        require Format::Human::Bytes;
+    };
+    return $Bytes if $@; # Doesn't look good, but works
+
+    return Format::Human::Bytes::base2($Bytes,1);
+
 }