From: Hans-Emil Skogh <hansemil@gmail.com>
Date: Sat, 14 Jan 2012 14:11:59 +0000 (+0100)
Subject: "Human readable" style size displays for apk and source downloads.
X-Git-Tag: 0.1~1063^2~8
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1bd9c9d0dc016ee179acf4c8959f954e320aae50;p=fdroidserver.git

"Human readable" style size displays for apk and source downloads.
---

diff --git a/wp-fdroid/wp-fdroid.php b/wp-fdroid/wp-fdroid.php
index 1fb3d1ac..0ea58d6c 100644
--- a/wp-fdroid/wp-fdroid.php
+++ b/wp-fdroid/wp-fdroid.php
@@ -211,9 +211,11 @@ class FDroid
 				foreach($apks as $apk) {
 					$out.="<p><b>Version ".$apk['version']."</b><br />";
 					$out.='<a href="http://f-droid.org/repo/'.$apk['apkname'].'">download apk</a> ';
-					$out.=$apk['size']." bytes";
-					if($apk['srcname'])
-						$out.='<br><a href="http://f-droid.org/repo/'.$apk['srcname'].'">source tarball</a>';
+					$out.=$this->human_readable_size($apk['size']);
+					if($apk['srcname']) {
+						$out.='<br /><a href="http://f-droid.org/repo/'.$apk['srcname'].'">source tarball</a> ';
+						$out.=$this->human_readable_size(filesize($this->site_path.'/repo/'.$apk['srcname']));
+					}
 
 					if(isset($apk['permissions'])) {
 						/*if($i==0)
@@ -293,6 +295,17 @@ class FDroid
 			return '<span style="color:#33AA33;font-size:130%;">&#x2699;</span>';
 		}
 	}
+	
+	private function human_readable_size($size) {
+		$si_prefix = array('bytes','kB','MB');
+		$div = 1000;
+		
+		for($i=0;$size > $div && $i < count($si_prefix);$i++) {
+			$size /= $div;
+		}
+
+		return round($size,max(0,$i-1)).' '.$si_prefix[$i];
+	}
 
 	function get_apps($query_vars) {