active download list 40%

2 files changed, 166 insertions, 14 deletions

diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html
index 307dd821a..f9ea8c3a2 100644
--- a/module/web/templates/default/base.html
+++ b/module/web/templates/default/base.html
@@ -11,10 +11,133 @@
 {% endblock %}

 <title>{% block title %}pyLoad Webinterface{% endblock %}</title>

 <script type="text/javascript">

+sprintfWrapper = {

+ 

+	init : function () {

+ 

+		if (typeof arguments == "undefined") { return null; }

+		if (arguments.length < 1) { return null; }

+		if (typeof arguments[0] != "string") { return null; }

+		if (typeof RegExp == "undefined") { return null; }

+ 

+		var string = arguments[0];

+		var exp = new RegExp(/(%([%]|(\-)?(\+|\x20)?(0)?(\d+)?(\.(\d)?)?([bcdfosxX])))/g);

+		var matches = new Array();

+		var strings = new Array();

+		var convCount = 0;

+		var stringPosStart = 0;

+		var stringPosEnd = 0;

+		var matchPosEnd = 0;

+		var newString = '';

+		var match = null;

+ 

+		while (match = exp.exec(string)) {

+			if (match[9]) { convCount += 1; }

+ 

+			stringPosStart = matchPosEnd;

+			stringPosEnd = exp.lastIndex - match[0].length;

+			strings[strings.length] = string.substring(stringPosStart, stringPosEnd);

+ 

+			matchPosEnd = exp.lastIndex;

+			matches[matches.length] = {

+				match: match[0],

+				left: match[3] ? true : false,

+				sign: match[4] || '',

+				pad: match[5] || ' ',

+				min: match[6] || 0,

+				precision: match[8],

+				code: match[9] || '%',

+				negative: parseInt(arguments[convCount]) < 0 ? true : false,

+				argument: String(arguments[convCount])

+			};

+		}

+		strings[strings.length] = string.substring(matchPosEnd);

+ 

+		if (matches.length == 0) { return string; }

+		if ((arguments.length - 1) < convCount) { return null; }

+ 

+		var code = null;

+		var match = null;

+		var i = null;

+ 

+		for (i=0; i<matches.length; i++) {

+ 

+			if (matches[i].code == '%') { substitution = '%' }

+			else if (matches[i].code == 'b') {

+				matches[i].argument = String(Math.abs(parseInt(matches[i].argument)).toString(2));

+				substitution = sprintfWrapper.convert(matches[i], true);

+			}

+			else if (matches[i].code == 'c') {

+				matches[i].argument = String(String.fromCharCode(parseInt(Math.abs(parseInt(matches[i].argument)))));

+				substitution = sprintfWrapper.convert(matches[i], true);

+			}

+			else if (matches[i].code == 'd') {

+				matches[i].argument = String(Math.abs(parseInt(matches[i].argument)));

+				substitution = sprintfWrapper.convert(matches[i]);

+			}

+			else if (matches[i].code == 'f') {

+				matches[i].argument = String(Math.abs(parseFloat(matches[i].argument)).toFixed(matches[i].precision ? matches[i].precision : 6));

+				substitution = sprintfWrapper.convert(matches[i]);

+			}

+			else if (matches[i].code == 'o') {

+				matches[i].argument = String(Math.abs(parseInt(matches[i].argument)).toString(8));

+				substitution = sprintfWrapper.convert(matches[i]);

+			}

+			else if (matches[i].code == 's') {

+				matches[i].argument = matches[i].argument.substring(0, matches[i].precision ? matches[i].precision : matches[i].argument.length)

+				substitution = sprintfWrapper.convert(matches[i], true);

+			}

+			else if (matches[i].code == 'x') {

+				matches[i].argument = String(Math.abs(parseInt(matches[i].argument)).toString(16));

+				substitution = sprintfWrapper.convert(matches[i]);

+			}

+			else if (matches[i].code == 'X') {

+				matches[i].argument = String(Math.abs(parseInt(matches[i].argument)).toString(16));

+				substitution = sprintfWrapper.convert(matches[i]).toUpperCase();

+			}

+			else {

+				substitution = matches[i].match;

+			}

+ 

+			newString += strings[i];

+			newString += substitution;

+ 

+		}

+		newString += strings[i];

+ 

+		return newString;

+ 

+	},

+ 

+	convert : function(match, nosign){

+		if (nosign) {

+			match.sign = '';

+		} else {

+			match.sign = match.negative ? '-' : match.sign;

+		}

+		var l = match.min - match.argument.length + 1 - match.sign.length;

+		var pad = new Array(l < 0 ? 0 : l).join(match.pad);

+		if (!match.left) {

+			if (match.pad == "0" || nosign) {

+				return match.sign + pad + match.argument;

+			} else {

+				return pad + match.sign + match.argument;

+			}

+		} else {

+			if (match.pad == "0" || nosign) {

+				return match.sign + match.argument + pad.replace(/0/g, ' ');

+			} else {

+				return match.sign + match.argument + pad;

+			}

+		}

+	}

+}

+ 

+sprintf = sprintfWrapper.init;

 function LoadJsonToContent(data)

 {

 	JSONDATA = data;

-	$("#speed").text(Math.round(data.speed/0.01)*0.01);

+	$("#speed").text(Math.round(data.speed*100)/100);

 	$("#aktiv").text(data.queue);

 	$("#aktiv_from").text(data.total);

 	

@@ -28,6 +151,25 @@ function LoadJsonToContent(data)
 		$("#action_play").show();

 		$("#action_pause").hide();

 	}*/

+	setTimeout(function()

+   {

+    $.getJSON('/json/status', LoadJsonToContent );

+   }, 2000);

+}

+function LinksToContent(data)

+{

+	$("#LinksAktiv").text('');

+	$.each(data, function(i,item)

+	{

+		$("#LinksAktiv").append('<tr><td>'+item.name+'</td><td>'+item.status+'</td><td>'+Math.round(item.speed*100)/100+'@'+SecToRightTime(item.eta)+'</td><td>'+item.size+' MB</td><td>'+item.percent+'% / '+item.kbleft+' MB</td></tr>');

+	});

+	

+}

+function SecToRightTime(sek)

+{

+	vreturn = sek > 86400 ? sprintf('%d Tag%s ', sek / 86400, Math.floor(sek / 86400) != 1 ? 'e':'') : '';

+	vreturn += sprintf('%02d:%02d:%02d', sek / 3600 % 24, sek / 60 % 60, sek % 60 );

+	return vreturn;

 }

 

 $(document).ready(function(){

@@ -43,11 +185,8 @@ $(document).ready(function(){
 	 {  // mouseout 

 		  $(this).attr("id", "");

 	 });*/

-	var refreshId = setInterval(function()

-   {

-    $.getJSON('/json/status', LoadJsonToContent );

-   }, 1000);

-

+	$.getJSON('/json/links', LinksToContent );

+	$.getJSON('/json/status', LoadJsonToContent );

 });

 </script>

 </head>

diff --git a/module/web/templates/default/home.html b/module/web/templates/default/home.html
index fac4b6e63..ac9c5d25c 100644
--- a/module/web/templates/default/home.html
+++ b/module/web/templates/default/home.html
@@ -1,9 +1,22 @@
-{% extends 'default/base.html' %}
-
-{% block subtitle %}
-Active Downloads
-{% endblock %}
-
-
-{% block content %}
+{% extends 'default/base.html' %}

+

+{% block subtitle %}

+Active Downloads

+{% endblock %}

+

+

+

+{% block content %}

+<table>

+<tbody id="LinksAktiv">

+  <tr>

+    <td></td>

+    <td></td>

+    <td></td>

+    <td></td>

+    <td></td>

+  </tr>

+<tbody>

+</table>

+

 {% endblock %}
\ No newline at end of file