add mpg, fix diag

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@735 2a923420-c742-0410-a762-8d5b09965624

CONTROL/control

@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 0.9.2
+Version: 0.9.2-1
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
 Depends: mongoose(>=3.0-7),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73),jim-cgi(>=0.5),service-control,busybox(>=1.19.3-1),lsof,epg(>=1.0.8),hmt(>=1.1.4),ssmtp,anacron,trm,openssl-command,nicesplice,id3v2

var/mongoose/cgi-bin/browse/assets.jim

@@ -17,7 +17,10 @@ if {$model eq "HDR"} {
 	puts { <li class="separator"><a href=#decrypt>Decrypt</a></li> }
 }
 if {[system pkginst ffmpeg]} {
-	puts { <li><a href=#audio>Extract Audio</a></li> }
+	puts {
+		<li><a href=#audio>Extract Audio</a></li>
+		<li><a href=#mpg>Extract to MPG</a></li>
+	}
 }
 if $nicesplice {
 	puts {

var/mongoose/cgi-bin/browse/browse.js

@@ -268,9 +268,15 @@ function preparemenu(el, menu)
 			$(menu).disableContextMenuItems('#decrypt');
 
 		if (el.attr('odencd') == 1)
+		{
 			$(menu).disableContextMenuItems('#audio');
+			$(menu).disableContextMenuItems('#mpg');
+		}
 		else
+		{
 			$(menu).enableContextMenuItems('#audio');
+			$(menu).enableContextMenuItems('#mpg');
+		}
 	}
 	else
 	{
@@ -280,6 +286,7 @@ function preparemenu(el, menu)
 		$(menu).disableContextMenuItems('#new');
 		$(menu).disableContextMenuItems('#decrypt');
 		$(menu).disableContextMenuItems('#audio');
+		$(menu).disableContextMenuItems('#mpg');
 		$(menu).disableContextMenuItems('#crop');
 		$(menu).disableContextMenuItems('#chunk');
 	}
@@ -385,6 +392,11 @@ var menuclick = function(action, el, pos)
 		    file;
 		break;
 
+	    case 'mpg':
+		window.location.href = '/cgi-bin/browse/mpg/mpg.jim?file=' +
+		    file;
+		break;
+
 	    default:
 		alert('Unhandled action: ' + action);
 		break;

var/mongoose/cgi-bin/browse/mpg/execute.jim

@@ -0,0 +1,31 @@
+#!/mod/bin/jimsh
+
+package require sqlite3
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class system.class
+
+puts "Content-Type: text/html\r\n\r\n"
+
+cgi_input
+#cgi_dump
+
+set rfile [cgi_get file]
+set ts [ts fetch $rfile]
+set dir [file dirname $rfile]
+set len [$ts duration 1]
+
+set xstart [clock milliseconds]
+
+set base [file rootname $rfile]
+set shname [file tail $base]
+puts "Processing $shname"
+
+puts [exec /mod/bin/ffmpeg -y -benchmark -v 0 \
+    -i $rfile \
+    -map 0:0 -map 0:1 \
+    -vcodec copy -acodec copy "${base}.mpg"]
+
+set xtime [expr [expr [clock milliseconds] - $xstart] / 1000.0]
+puts "Time taken: $xtime"
+

var/mongoose/cgi-bin/browse/mpg/mpg.jim

@@ -0,0 +1,52 @@
+#!/mod/bin/jimsh
+
+package require sqlite3
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class system.class
+
+puts "Content-Type: text/html\r\n\r\n"
+
+cgi_input
+#cgi_dump
+
+set rfile [cgi_get file]
+set ts [ts fetch $rfile]
+set dir [file dirname $rfile]
+set len [$ts duration 1]
+
+header
+
+puts "
+<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
+<script type=text/javascript src=/js/jquery.progressbar.js></script>
+<script type=text/javascript src=mpg.js></script>
+
+<fieldset class=cleft>
+<legend>Audio Extraction</legend>
+
+<table class=keyval cellpadding=5>
+<tr><th>File:</th><td>$rfile</td></tr>
+<tr><th>Length:</th><td>[clock format $len -format "%T"]</td></tr>
+</table>
+
+<span class=hidden id=params
+    dir=\"[cgi_quote_url $dir]\"
+    rfile=\"[cgi_quote_url $rfile]\"
+></span>
+
+<div id=mpgdiv style=\"padding: 1em\">
+<button id=mpgit>Perform mpg extraction</button>
+</div>
+
+<div id=progressdiv class=hidden>
+Extracting mpg: <div id=progressbar></div>
+</div>
+
+<button id=back class=hidden>Back to media list</button>
+
+<div id=output class=pre style=\"margin-top: 10px\"></div>
+</fieldset>
+
+"
+

var/mongoose/cgi-bin/browse/mpg/mpg.js

@@ -0,0 +1,35 @@
+
+var handle = 0;
+
+function update()
+{
+	$.get('progress.jim?file=' + $('#params').attr('rfile'),
+	    function(data) {
+		if (handle)
+			$('#progressbar').reportprogress(data);
+	});
+}
+
+$(document).ready(function() {
+
+$('#progressbar').reportprogress(0);
+
+$('#back').button().click(function() {
+	window.location = '/cgi-bin/browse.jim?dir=' + $('#params').attr('dir');
+});
+
+$('#mpgit').button().click(function() {
+	$('#mpgdiv').hide('slow');
+	$('#progressdiv').show('slow');
+	handle = setInterval("update()", 1000);
+	$('#output').load('execute.jim?file=' + $('#params').attr('rfile'),
+	    function() {
+		clearInterval(handle);
+		handle = 0;
+		$('#back').show();
+		$('#progressbar').reportprogress(100);
+	});
+});
+
+});
+

var/mongoose/cgi-bin/browse/mpg/progress.jim

@@ -0,0 +1,26 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class
+
+puts "Content-Type: text/html\r\n\r\n"
+
+cgi_input
+#cgi_dump
+
+set tsfile [cgi_get file]
+set rfile [file normalize $tsfile]
+set bfile [file rootname $rfile]
+
+if {![file exists "${bfile}.mpg"]} {
+	puts "0"
+} else {
+	set sz [file size $rfile]
+	set nsz [expr [file size "${bfile}.mpg"] / 0.3]
+
+	set perc [expr $nsz * 100 / $sz]
+	if {$perc > 100} { set perc 100 }
+	puts $perc
+}
+

var/mongoose/html/diag.shtml

@@ -23,7 +23,9 @@ $('#rundiag').button().click(function() {
 	    .slideDown()
 	    .text('\n\nRunning diagnostic, please wait...\n\n')
 	    .load('/cgi-bin/diag.jim?diag=' +
-	    encodeURIComponent($('#seq').val()));
+	    encodeURIComponent($('#seq').val()), function() {
+		$('#results').wrapInner('<pre>');
+	    });
 });
 $('a.log').click(function() {
 	$('#results')