From 7b8cdc9d6bf60507e1acf44c6379738ce3361183 Mon Sep 17 00:00:00 2001
From: Hamza Zia <ziahamza2007@gmail.com>
Date: Wed, 6 Jun 2012 13:17:39 +0800
Subject: [PATCH] eta time added to active downloads

---
 index.html   |  5 +++--
 js/script.js | 26 +++++++++++++++++++-------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/index.html b/index.html
index 4baa526..bb51cda 100755
--- a/index.html
+++ b/index.html
@@ -29,9 +29,10 @@
 		</div>
 		<div class="span6">
 			<b style='display:inline; float:right;'>
-				<span class="label label-success">Size: {{size}}</span> |
+				<span class="label label-success">Remaining: {{remaining}}</span> |
 				<span class="label label-success">Progress: {{percentage}}%</span> |
-				<span class="label label-success">Speed: {{down}}</span>
+				<span class="label label-success">Speed: {{down}}</span> |
+				<span class="label label-success">Time left: {{eta}}</span>
 			</b>
 		</div>
 		<div class="span2">
diff --git a/js/script.js b/js/script.js
index 501e369..b4aacb2 100755
--- a/js/script.js
+++ b/js/script.js
@@ -96,7 +96,8 @@ function newDownload() {
 		urls.push($(li[i]).text().trim());
 
 	}
-	alert(JSON.stringify(urls));
+	var inp_url = $('#newDownload_url').val().trim();
+	if(inp_url.length > 0) urls.push(inp_url);
 	addDownload([urls]);
 }
 
@@ -108,11 +109,16 @@ var d_files = {
 function changeLength(len, pref) {
 	len = parseInt(len);
 	if(len <= 1000) return len  + " " + pref;
-	else if(len <= 1000000) return Math.round(len/1000 * 100)/100 + " k" + pref;
-	else if(len <= 1000000000) return Math.round(len/1000000 *100)/100 + " m" + pref;
-	else if(len <= 1000000000000) return Math.round(len/1000000000 *100)/100 + " g" + pref;
+	else if(len <= 1000000) return Math.round(len/1000 * 10)/10 + " k" + pref;
+	else if(len <= 1000000000) return Math.round(len/1000000 *10)/10 + " m" + pref;
+	else if(len <= 1000000000000) return Math.round(len/1000000000 *10)/10 + " g" + pref;
 }
 function changeTime(time) {
+	time = parseInt(time);
+	if(time < 60) return time + " s";
+	else if(time < 60*60) return Math.round(time/60 *100)/100 + " min";
+	else if(time < 60*60*24) return Math.round(time/(60*60) *100)/100 + " hours";
+	else return Math.round(time/(60*60*24) *100)/100 + " days!!";
 
 }
 function updateActiveDownloads(data) {
@@ -138,7 +144,9 @@ function updateActiveDownloads(data) {
 			percentage:percentage,
 			gid: data[i].gid,
 			size: changeLength(data[i].totalLength, "b"),
-			down: changeLength(data[i].downloadSpeed, "b/s")
+			down: changeLength(data[i].downloadSpeed, "b/s"),
+			remaining: changeLength(data[i].totalLength - data[i].completedLength, "b"),
+			eta: changeTime((data[i].totalLength-data[i].completedLength)/data[i].downloadSpeed)
 		};
 		var item = Mustache.render(down_template, ctx);
 		$('#active_downloads').append(item);
@@ -195,7 +203,9 @@ function updateWaitingDownloads(data) {
 			percentage:percentage,
 			gid: data[i].gid,
 			size: changeLength(data[i].totalLength, "b"),
-			down: changeLength(data[i].downloadSpeed, "b/s")
+			down: changeLength(data[i].downloadSpeed, "b/s"),
+			remaining: changeLength(data[i].totalLength - data[i].completedLength, "b"),
+			eta: changeTime((data[i].totalLength-data[i].completedLength)/data[i].downloadSpeed)
 		};
 		var item = Mustache.render(down_template, ctx);
 		$('#waiting_downloads').append(item);
@@ -253,7 +263,9 @@ function updateStoppedDownloads(data) {
 			percentage:percentage,
 			gid: data[i].gid,
 			size: changeLength(data[i].totalLength, "b"),
-			down: changeLength(data[i].downloadSpeed, "b/s")
+			down: changeLength(data[i].downloadSpeed, "b/s"),
+			remaining: changeLength(data[i].totalLength - data[i].completedLength, "b"),
+			eta: changeTime((data[i].totalLength-data[i].completedLength)/data[i].downloadSpeed)
 		};
 		var item = Mustache.render(down_template, ctx);
 		$('#stopped_downloads').append(item);