tag 0.8.3

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

CONTROL/control

@@ -1,11 +1,11 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 0.7.5
+Version: 0.8.3
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
-Depends: mongoose(>=3.0-2),jim(>=0.71-1),jim-sqlite3(>=0.71-1),jim-cgi(>=0.4),jim-oo,jim-pack,service-control,busybox(>=1.18.3-1),lsof,epg(>=1.0.5),hmt(>=1.0.6),ssmtp
+Depends: mongoose(>=3.0-2),jim(>=0.71-1),jim-sqlite3(>=0.71-1),jim-cgi(>=0.4-1),jim-oo,jim-pack,service-control,busybox(>=1.19.3-1),lsof,epg(>=1.0.8),hmt(>=1.1.1),ssmtp
 Replaces: af123-webif
 Conflicts: af123-webif
-Suggests: ffmpeg,webif-iphone
+Suggests: ffmpeg,webif-iphone,nicesplice
 Description: An evolving web interface for the Humax.

etc/init.d/S60parseepg

@@ -1,9 +1,5 @@
 #!/bin/sh
 
-export PATH=/mod/bin:/mod/usr/bin:/mod/bin/busybox:/bin:/sbin
-export LD_LIBRARY_PATH=/mod/lib:/lib:/usr/lib
-export TZ=GMT+0BST,M3.5.0/1,M10.5.0/2
-
 if [ -f /mnt/hd1/dvbepg/epg.dat ]; then
 	epg=/mnt/hd1/dvbepg/epg.dat
 	epgdb=/mnt/hd1/epg.db
@@ -14,30 +10,15 @@ fi
 
 case "$1" in
 	start)
-		(
-			while [ 1 ]; do
-				if [ -f $epgdb ]; then
-					touch $epgdb.stamp
-					now=`stat -c %Z $epgdb.stamp`
-					dbstamp=`stat -c %Z $epgdb`
-					age=`expr $now - $dbstamp`
-				else
-					age=99999
-				fi
-				echo "EPG Database age: $age"
-				if [ $age -gt 28800 ]; then
-					sleep 120
-					echo "Generating EPG database..."
-					/mod/bin/epg -f $epg sqlitedump $epgdb
-				fi
-				sleep 3712
-			done
-		) &
+		/mod/bin/epg -f $epg sqlitedumpd $epgdb > /tmp/epgd.log &
 		;;
 	stop)
+		killall -q epg
 		;;
 	*)
 		exit 1
 		;;
 esac
 
+exit 0
+

var/mongoose/cgi-bin/browse.jim

@@ -2,11 +2,13 @@
 
 package require cgi
 source /mod/var/mongoose/lib/setup
-require ts.class pretty_size
+require ts.class pretty_size system.class
 
 puts "Content-Type: text/html"
 puts ""
 
+set nicesplice [system pkginst nicesplice]
+
 set ignore {.nts .thm .hmt .hmi}
 set include {.ts .avi .mpg .mpeg .wmv .mkv .mp3 .mp4 .mov}
 
@@ -14,14 +16,16 @@ cgi_input
 #cgi_dump
 
 #set env(REQUEST_URI) ''
-#set _cgi(dir) "/media/My Video/Chuggington"
+#set _cgi(dir) "/media/My Video/\[Don't Die Young\]"
 
 proc directory {file bfile} {
 	regsub -all " +" $bfile "" tbfile
 	puts "<div class=va>"
-	puts "<a href=$::env(REQUEST_URI)?dir=[cgi_quote_url $file]>"
 	puts "<img border=0 class=va id=\"img$tbfile\"
 	    src=/images/711_1_09_Media_Folder.png>"
+	puts "<input class=\"fs fsdir\" type=checkbox>"
+	puts "<a href=\"$::env(REQUEST_URI)?dir=[cgi_quote_url $file]\"
+	    file=\"$file\">"
 	puts "$bfile</a><span class=filesize id=\"$tbfile\">
 		</span></div>"
 }
@@ -53,11 +57,6 @@ proc entry {file} {{i 0}} {
 		set img Video_Other
 	}
 
-	puts "
-	    <div class=\"va bf\" id=[incr i]>
-	      <a class=bf file=\"$file\" type=$type href=#>
-	"
-
 	set new 0
 	if {$type eq "ts"} {
 		if {[$ts flag "New"] > 0} { set new 1 }
@@ -67,11 +66,18 @@ proc entry {file} {{i 0}} {
 
 	if {$new} { append img _New }
 
-	puts "<img class=va border=0 src=/img/$img.png>"
+	set fscl "fs"
+	if {$type eq "ts"} {
+		set fscl "fs fsts"
+	}
 
 	puts "
-		$bfile
-	      </a>
+	    <div class=\"va bf\" id=[incr i]>
+		<img class=va border=0 src=/img/$img.png>
+		<input class=\"$fscl\" type=checkbox>
+		<a class=bf file=\"$file\" type=$type href=#>
+		    $bfile
+	        </a>
 	"
 
 	# Size
@@ -81,7 +87,9 @@ proc entry {file} {{i 0}} {
 
 	set locked 0
 	set encd 0
+	set odencd 1
 	set def unknown
+	set bx 0
 	if {$type eq "ts"} {
 		# HD / SD
 		if {[$ts get definition] eq "HD"} {
@@ -107,6 +115,10 @@ proc entry {file} {{i 0}} {
 			    src=/images/749_1_26_Video_Encryption.png
 			    height=21>"
 		}
+		if {![$ts flag "ODEncrypted"]} {
+			puts "<img class=va src=/img/Decrypted.png height=21>"
+			set odencd 0
+		}
 
 		# Guidance
 		if {[$ts flag "Guidance"] > 0} {
@@ -114,6 +126,8 @@ proc entry {file} {{i 0}} {
 			    src=/images/174_1_26_GuidancePolicy.png
 			    height=21>"
 		}
+
+		set bx [$ts get bookmarks]
 	}
 
 	# Opt+ button
@@ -121,7 +135,8 @@ proc entry {file} {{i 0}} {
 	puts "
 	      <a href=#>
 		<img class=\"opt va\" border=0 width=45 type=$type did=$i
-		    locked=$locked encd=$encd def=$def new=$new
+		    locked=$locked encd=$encd def=$def new=$new bx=$bx
+		    odencd=$odencd
 		    src=/images/181_1_00_Help5_OPT_Plus.png>
 	      </a>
 	    <div class=\"results blood\" style=\"margin: 0 0 0 5em\"></div>
@@ -129,11 +144,7 @@ proc entry {file} {{i 0}} {
 	puts "</div>"
 }
 
-if {[dict exists $_cgi dir]} {
-	set dir [dict get $_cgi dir]
-} else {
-	set dir "/media/My Video"
-}
+set dir [cgi_get dir [system mediaroot]]
 
 ######################################################################
 # Render web page
@@ -145,12 +156,20 @@ puts {
 	<script type="text/javascript" src="/js/jquery.contextMenu.js"></script>
 
 	<ul id=optmenu class=contextMenu>
-		<li><a href=#delete>Delete</a></li>
+		<li class=delete><a href=#delete>Delete</a></li>
 		<li><a href=#lock>Toggle Lock</a></li>
 		<li><a href=#enc>Toggle Enc</a></li>
 		<li><a href=#new>Toggle New</a></li>
 		<li><a href=#rename>Rename</a></li>
 		<li><a href=#download>Download</a></li>
+}
+if {[system model] eq "HDR"} {
+	puts { <li class="separator"><a href=#decrypt>Decrypt</a></li> }
+}
+if $nicesplice {
+	puts { <li class="cut separator"><a href=#crop>Crop</a></li> }
+}
+puts {
 	</ul>
 
 	<div id=renameform title="Rename media file" style="display: none">
@@ -252,27 +271,50 @@ if {$parent ne ""} {
 # Strip double slashes
 regsub -all -- {\/+} "$dir/*" "/" dir
 
+# Escape square brackets (for glob)
+regsub -all {([\\[])} $dir {\\\1} dir
+
 foreach file [lsort [glob -nocomplain "$dir"]] {
 	entry $file
 }
 
+puts "<a href=# id=selectall>Select all</a> | <a href=# id=deselectall>none</a>"
+
 puts "</fieldset>"
 
+puts "<div class=brow>"
+
+puts {
+<button id=delete>Delete</button>
+<div id=deletewait class=blood style="display: none">
+<img src=/img/loading.gif>Deleting may take some time, please be patient...
+</div>
+}
+
+# Join
+if $nicesplice {
+	puts { <button id=join>Join</button> }
+}
+
+puts "</div><div class=brow style=\"margin-top: 3px\">"
+
 # De-duplicate
 
 puts {
-	<small><button id=dedup>De-duplicate/tidy this folder</button></small>
+	<button id=dedup>De-duplicate/tidy this folder</button>
 }
 
 # Streamer file
 
 if {[file exists /mnt/hd3/Streamer_down_file]} {
-	puts {
-<small><button id=save_stream file=/mnt/hd3/Streamer_down_file>
-	Save last streamed content (e.g. iPlayer/YouTube)
-</button></small>
-}
+		puts {
+	<button id=save_stream file=/mnt/hd3/Streamer_down_file>
+		Save last streamed content (e.g. iPlayer/YouTube)
+	</button>
+	}
 }
 
+puts "</div>"
+
 footer
 

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

@@ -1,3 +1,28 @@
+(function($)
+{
+	$.fn.enable = function()
+	{
+		return this.each(function() {
+			$(this)
+			    .removeClass('ui-state-disabled')
+			    .removeProp('disabled');
+		});
+	};
+
+	$.fn.disable = function()
+	{
+		return this.each(function() {
+			$(this)
+			    .addClass('ui-state-disabled')
+			    .prop('disabled', true);
+		});
+	};
+})(jQuery);
+
+function disableall()
+{
+	$('button,a,input').disable();
+}
 
 function epginfo_callback(data, status, xhr)
 {
@@ -56,7 +81,10 @@ function delete_callback(file, type, id)
 	var results = el + ' .results';
 	var url = '/cgi-bin/browse/delete.jim?file=' +
 	    encodeURIComponent(file) + '&type=' + type;
-	$(results).load(url, function() {
+	$(results)
+	    .html('<img src=/img/loading.gif>Deleting, please wait...')
+	    .slideDown('slow')
+	    .load(url, function() {
 		$(el).delay(3000).slideUp(300, function() {
 			$(el).remove();
 		});
@@ -127,13 +155,16 @@ function preparemenu(el, menu)
 			$('#optmenu').enableContextMenuItems('#enc');
 			if (el.attr('encd') == 1)
 				$(menu).changeContextMenuItem('#enc',
-				    'Remove ENC');
+				    'Remove Enc');
 			else
 				$(menu).changeContextMenuItem('#enc',
-				    'Set ENC');
+				    'Set Enc');
 		}
+
+		if (el.attr('bx') > 0)
+			$('#optmenu').enableContextMenuItems('#crop');
 		else
-			$('#optmenu').disableContextMenuItems('#enc');
+			$('#optmenu').disableContextMenuItems('#crop');
 
 		$('#optmenu').enableContextMenuItems('#new');
 		if (el.attr('new') == 1)
@@ -153,6 +184,12 @@ function preparemenu(el, menu)
 			$(menu).changeContextMenuItem('#lock', 'Lock');
 			$('#optmenu').enableContextMenuItems('#delete');
 		}
+
+		if (el.attr('odencd') == 1)
+			$('#optmenu').enableContextMenuItems('#decrypt');
+		else
+			$('#optmenu').disableContextMenuItems('#decrypt');
+	
 	}
 	else
 	{
@@ -160,6 +197,8 @@ function preparemenu(el, menu)
 		$('#optmenu').disableContextMenuItems('#lock');
 		$('#optmenu').disableContextMenuItems('#enc');
 		$('#optmenu').disableContextMenuItems('#new');
+		$('#optmenu').disableContextMenuItems('#decrypt');
+		$('#optmenu').disableContextMenuItems('#crop');
 	}
 
 }
@@ -219,6 +258,16 @@ var menuclick = function(action, el, pos)
 		    encodeURIComponent(file);
 		break;
 
+	    case 'crop':
+		window.location.href = '/cgi-bin/browse/crop.jim?file=' +
+		    encodeURIComponent(file);
+		break;
+
+	    case 'decrypt':
+		window.location.href = '/cgi-bin/browse/decrypt.jim?file=' +
+		    encodeURIComponent(file);
+		break;
+
 	    default:
 		alert('Unhandled action: ' + action);
 		break;
@@ -309,6 +358,11 @@ var menuclick = function(action, el, pos)
 	$.getJSON('/cgi-bin/browse/newdir.jim?dir=' + encodeURIComponent(dir),
 		new_folder_callback);
 
+	// Uncheck everything
+	$('input.fs:checked').attr('checked', false);
+
+	// Buttons
+
 	$('#dedup').button().click(function() {
 		window.location = '/cgi-bin/dedup.jim?dir='
 		    + encodeURIComponent(dir);
@@ -321,5 +375,63 @@ var menuclick = function(action, el, pos)
 		    '/cgi-bin/browse/ffmpeg.jim?file=' +
 		    encodeURIComponent($('#save_stream').attr('file')));
 	});
+
+	$('#selectall').click(function(e) {
+		e.preventDefault();
+		$('input.fs').attr('checked', true).trigger('change');
+	});
+	$('#deselectall').click(function(e) {
+		e.preventDefault();
+		$('input.fs:checked').attr('checked', false).trigger('change');
+	});
+
+	$('#join').button().disable()
+	    .click(function() {
+		var files = new Array();
+		var els = $('input.fsts:checked + a').each(function() {
+			files.push(encodeURIComponent($(this).attr('file')));
+		});
+		//console.log("%o", files);
+		window.location.href = '/cgi-bin/browse/join.jim?files=' +
+		    files.join();
+	    });
+
+	$('#delete').button().disable()
+	    .click(function() {
+		var files = new Array();
+		var els = $('input.fs:checked + a').each(function() {
+			files.push(encodeURIComponent($(this).attr('file')));
+		});
+		//console.log("%o", files);
+		var str = 'Are you sure you want to delete ' + files.length +
+		    ' file';
+		if (files.length != 1) str += 's';
+		str += '?';
+		if (confirm(str))
+		{
+			disableall();
+			$('#deletewait').slideDown('slow');
+			window.location.href =
+			    '/cgi-bin/browse/mdelete.jim?dir=' +
+			    encodeURIComponent(dir) + '&files=' +
+		    	    files.join();
+		}
+	    });
+
+	$('input.fs').change(function() {
+		var num = $('input.fs:checked').size();
+		if (num > 0)
+			$('#delete').enable();
+		else
+			$('#delete').disable();
+	
+		var num = $('input.fsts:checked').size();
+		if (num > 1)
+			$('#join').enable();
+		else
+			$('#join').disable();
+
+	});
+
 });
 

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

@@ -0,0 +1,192 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class pretty_size
+
+puts "Content-Type: text/html\r\n\r\n"
+
+cgi_input
+#cgi_dump
+
+set tsfile [cgi_get file]
+set rfile [file normalize $tsfile]
+set ts [ts fetch $rfile]
+set dir [file dirname $rfile]
+
+set len [$ts duration 1]
+
+if {[cgi_get do] eq "it"} {
+
+	set cropstart [clock milliseconds]
+
+	set base [file rootname $rfile]
+	set origdir "$dir/_original"
+	if {![file exists $origdir]} { file mkdir $origdir }
+
+	set shname [file tail $base]
+	puts "Processing $shname"
+
+	if {[file exists "$origdir/$shname.ts"]} {
+		puts "This recording already exists within _original"
+		puts "Cannot continue."
+		exit
+	}
+
+	puts "Moving recording to $origdir"
+	foreach f [glob -nocomplain "${base}.*"] {
+		set tail [file tail $f]
+		puts "  $tail"
+		file rename $f "$origdir/$tail"
+	}
+
+	puts [exec /mod/bin/nicesplice \
+	    -in "$origdir/$shname" \
+	    -out "$dir/$shname" \
+	    -cutBookMarks]
+
+	set newname "$shname-[clock seconds]"
+	puts "Renaming file group to $newname"
+	ts renamegroup "$dir/$shname.ts" $newname
+	exec /mod/bin/hmt "+setfilename=$newname" "$dir/$newname.hmt"
+
+	set croptime [expr [expr [clock milliseconds] - $cropstart] / 1000.0]
+	puts "Time taken: $croptime"
+
+	exit
+}
+
+header
+
+puts "
+<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
+<script type=\"text/javascript\" src=\"/js/jquery.progressbar.js\"></script>
+
+<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>
+<tr><th>Size:</th><td>[pretty_size [$ts size]] ([$ts get definition])</td></tr>
+<tr><th>Bookmarks:</th><td>[$ts get bookmarks] @ "
+
+set flag 0
+foreach b [$ts bookmarks] {
+	if $flag { puts -nonewline ", " }
+	incr flag
+	puts -nonewline [clock format $b -format "%T"]
+}
+
+puts "</td></tr><tr><th>File</th><td>"
+
+puts "<div style=\"position: relative; top: -10px\">"
+
+proc div {type left right} {
+	set width $($right - $left)
+	puts "<div class=$type style=\"left: ${left}px; width: ${width}px\">
+	    $type</div>"
+}
+
+set keeping 0
+set last 0
+set start -1
+foreach b [$ts bookmarks] {
+	if {$start < 0} {
+		set start $b
+		continue
+	}
+	set end $b
+
+	incr keeping $($end - $start)
+
+	set left $($start * 500 / $len)
+	set right $($end * 500 / $len)
+
+	div cut $last $($left - 1)
+	div keep $left $($right - 1)
+
+	set last $right
+
+	set start -1
+}
+
+if {$start > 0} {
+	incr keeping $($len - $start)
+	set left $($start * 500 / $len)
+	div cut $last $($left - 1)
+	div keep $left 500
+} else {
+	div cut $last 500
+}
+
+set keepperc $($keeping * 100.0 / $len)
+set esttime $(int($keeping * 0.025))
+if {[$ts get definition] eq "HD"} { set esttime $($esttime * 4) }
+
+puts "
+</div>
+</td></tr>
+<tr><th>Keeping:</th><td>
+[clock format $keeping -format "%T"] ([format "%.2f" $keepperc]%)
+</td></tr>
+<tr><th>Time:</th>
+<td>Cropping will take around [clock format $esttime -format "%T"]</td></tr>
+</table>
+"
+
+puts "
+<div id=cropdiv>
+<button id=cropit>Perform crop operation</button>
+</div>
+<div id=progressdiv style=\"display: none\">
+Cropping: <div id=progressbar></div>
+<button id=back
+    dir=\"[cgi_quote_url $dir]\"
+    rfile=\"[cgi_quote_url $rfile]\"
+    perc=\"$keepperc\"
+    style=\"display: none\">Back to media list</button>"
+puts {
+<div id=output class=pre style="margin-top: 10px"></div>
+</div>
+
+<script type=text/javascript>
+
+var handle = 0;
+
+function update()
+{
+	$.get('/cgi-bin/browse/crop_progress.jim'
+	    + '?perc=' + $('#back').attr('perc')
+	    + '&file=' + $('#back').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=' + $(this).attr('dir');
+});
+
+$('#cropit').button().click(function() {
+	$('#cropdiv').hide('slow');
+	$('#progressdiv').show('slow');
+	handle = setInterval("update()", 1000);
+	$('#output').text('Please do not interrupt...')
+	    .load(document.URL + '&do=it',
+	    function() {
+		clearInterval(handle);
+		handle = 0;
+		$('#back').show();
+		$('#progressbar').reportprogress(100);
+	});
+});
+
+});
+</script>
+</div>
+
+}
+

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

@@ -0,0 +1,29 @@
+#!/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 perc [cgi_get perc 100]
+set tsfile [file normalize [cgi_get file]]
+
+set origfile "[file dirname $tsfile]/_original/[file tail $tsfile]"
+set newfile [file rootname $tsfile]
+
+if {![file exists $newfile]} {
+	puts "0"
+} else {
+	set sz [file size $origfile]
+	set expected $($sz / 100 * $perc)
+	set nsz [file size $newfile]
+
+	set perc [expr $nsz * 100 / $expected]
+	if {$perc > 100} { set perc 100 }
+	puts $perc
+}
+

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

@@ -0,0 +1,129 @@
+#!/mod/bin/jimsh
+
+package require sqlite3
+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 ts [ts fetch $rfile]
+set dir [file dirname $rfile]
+set len [$ts duration 1]
+lassign [$ts dlnaloc] url
+
+if {[cgi_get do] eq "it"} {
+
+	set base [file rootname $rfile]
+	set origdir "$dir/_original"
+	if {![file exists $origdir]} { file mkdir $origdir }
+
+	set shname [file tail $base]
+	puts "Processing $shname"
+
+	exec wget -O "$rfile.decrypting" $url
+
+	puts "Moving recording to $origdir"
+
+	foreach f [glob -nocomplain "${base}.*"] {
+		if {[file extension $f] eq ".decrypting"} { continue }
+		set tail [file tail $f]
+		puts "  $tail"
+		file rename $f "${origdir}/$tail"
+	}
+
+	file rename "$rfile.decrypting" $rfile
+
+	foreach ext {nts hmt thm} {
+		set sidecar "$shname.$ext"
+		if {[file exists "$origdir/$sidecar"]} {
+			puts "Copying back sidecar $ext"
+			file copy "$origdir/$sidecar" "$dir/$sidecar"
+		}
+	}
+
+	if {[file exists "$dir/$shname.hmt"]} {
+		exec /mod/bin/hmt -encrypted "$dir/$shname.hmt"
+	}
+
+	exit
+}
+
+header
+
+puts "
+<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
+<script type=\"text/javascript\" src=\"/js/jquery.progressbar.js\"></script>
+
+<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>
+<tr><th>DLNA URL</th><td>$url</td></tr>
+</table>
+"
+
+if {$url eq ""} {
+	puts "This file has not been indexed by the media server.
+	    Cannot decrypt."
+	exit
+}
+
+puts {
+
+<div style="margin-top: 10px"></div>
+<div id=decryptdiv><button id=decryptit>Perform decryption</button></div>
+<div id=progressdiv style="display: none">
+Decrypting: <div id=progressbar></div>
+}
+puts "<button id=back
+    dir=\"[cgi_quote_url $dir]\"
+    rfile=\"[cgi_quote_url $rfile]\"
+    style=\"display: none\">Back to media list</button>"
+puts {
+<div id=output class=pre style="margin-top: 10px"></div>
+</div>
+
+<script type=text/javascript>
+
+var handle = 0;
+
+function update()
+{
+	$.get('/cgi-bin/browse/decrypt_progress.jim?file='
+	    + $('#back').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=' + $(this).attr('dir');
+});
+
+$('#decryptit').button().click(function() {
+	$('#decryptdiv').hide('slow');
+	$('#progressdiv').show('slow');
+	handle = setInterval("update()", 1000);
+	$('#output').load(document.URL + '&do=it', function() {
+		clearInterval(handle);
+		handle = 0;
+		$('#back').show();
+		$('#progressbar').reportprogress(100);
+	});
+});
+
+});
+</script>
+</div>
+
+}
+

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

@@ -0,0 +1,23 @@
+#!/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]
+
+if {![file exists "$rfile.decrypting"]} {
+	puts "0"
+} else {
+	set sz [file size $rfile]
+	set nsz [file size "$rfile.decrypting"]
+
+	puts [expr $nsz * 100 / $sz]
+}
+

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

@@ -23,5 +23,6 @@ if {$type eq "ts"} {
 }
 
 file delete $file
+file delete "[file rootname $file].hmi"
 puts "Successfully deleted $file."
 

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

@@ -10,26 +10,21 @@ require ts.class
 cgi_input
 #cgi_dump
 
-set file [dict get $_cgi file]
+set file [cgi_get file]
 set rfile [file normalize $file]
 set ts [ts fetch $file]
 
-set dmsfile /mnt/hd2/dms_cds.db
-
+# Default to just downloading the raw file.
 set url $file
 set mime "video/ts"
-if {[file exists $dmsfile]} {
-	set db [sqlite3.open /mnt/hd2/dms_cds.db]
-	set muri [$db query "
-		select tblresource.mimetype, contenturi
-		from tblresource join tblmedia using (mediaid)
-		where localurl = '%s'" $rfile]
-	if {$muri != ""} {
-		set rec [lindex $muri 0]
-		set xuri [lindex $rec 3]
-		set mime [lindex $rec 1]
-		set url "http://$env(HTTP_HOST):9000/web/$xuri"
-	}
+
+# If it's encrypted on disk and the DLNA option is available, then use
+# the server to perform decryption on the fly.
+if {[$ts flag "ODEncrypted"] > 0} {
+	set dlna [$ts dlnaloc]
+	if {[llength $dlna]} { lassign $dlna url mime }
+
+	#puts "DLNA: $dlna"
 }
 
 puts "Content-Type: text/plain"

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

@@ -77,12 +77,24 @@ if {$type eq "ts"} {
 </tr><tr>
 	<th>Size</th>
 	<td>$sz</td>
+"
+set dlna [$ts dlnaloc]
+lassign $dlna url
+if {[llength $dlna]} {
+	puts "</tr><tr><th>DLNA&nbsp;URL</th>
+	   <td><a href=\"$url\">$url</a></td>"
+}
+puts "
 </tr><tr>
 	<th>Flags</th>
-	<td>[$ts get flags]</td>
-</tr>
-</table>
-	"
+	<td>[$ts get flags]
+"
+if {[$ts get bookmarks]} {
+		puts " \[Bookmarks: [$ts get bookmarks]\]"
+}
+
+	puts "</tr>"
+	puts "</table>"
 	exit
 }
 

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

@@ -0,0 +1,136 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class pretty_size
+
+puts "Content-Type: text/html\r\n\r\n"
+header
+
+cgi_input 1
+#cgi_dump
+
+puts {
+<style>
+#filelist { list-style-type: none; margin: 0; padding: 0; }
+#filelist li { margin: 0 3px 3px 3px; padding: 0.4em; padding-left: 1.5em;
+	height: 35px; }
+#filelist li span { position: absolute; margin-left: -1.3em; }
+span.pl { padding-left: 2em; }
+</style>
+
+<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
+<script type="text/javascript" src="/js/jquery.progressbar.js"></script>
+
+<p><b>
+Drag the files below into order, enter a name for the resulting file and then
+click the <i>Join</i> button.</b>
+}
+
+puts "<ul id=filelist>"
+set esize 0
+foreach file [split [cgi_get files] ","] {
+	set file [cgi_unquote_input $file]
+	set dir [file dirname $file]
+	set ts [ts fetch $file]
+	puts "<li class=\"va ui-state-default\" id=\"$file\"><span
+	    class=\"va ui-icon ui-icon-arrowthick-2-n-s\"></span>
+	    <img class=va src=/img/Video_TS.png>
+	    <span class=pl>
+	    $file ([clock format [$ts duration 1] -format "%T"])
+	    \[[pretty_size [$ts size]]\]
+	    <br><i style=\"font-size: 0.8em\">[$ts get title]</i>
+	    </span>
+	</li>"
+	incr esize [$ts size]
+}
+puts "</ul>"
+
+puts "
+<br><br>
+
+<div id=joindiv>
+Name for joined file:
+    <input id=dest name=dfile class=\"text ui-widget-content ui-corner-all\"
+    length=20 maxlength=50>
+<button id=dojoin>Join</button>
+</div>
+
+<div id=progressdiv style=\"display: none\">
+Joining: <div id=progressbar></div>
+<button id=back
+    dir=\"[cgi_quote_url $dir]\"
+    esize=\"$esize\"
+    style=\"display: none\">Back to media list</button>
+<div id=output class=pre style=\"margin-top: 10px\"></div>
+</div>
+"
+
+puts {
+<script type=text/javascript>
+
+$('#filelist li').hover(
+    function() { $(this).css('cursor', 'pointer'); },
+    function() { $(this).css('cursor', 'auto'); }
+);
+
+var handle = 0;
+
+function update()
+{
+	$.get('/cgi-bin/browse/join_progress.jim'
+	    + '?esize=' + $('#back').attr('esize')
+	    + '&file=' + $('#back').attr('dir') + '/' + $('#dest').val(),
+	    function(data) {
+		if (handle)
+			$('#progressbar').reportprogress(data);
+	});
+}
+
+$(document).ready(function() {
+
+$('#progressbar').reportprogress(0);
+
+$('#back').button().click(function() {
+	window.location = '/cgi-bin/browse.jim?dir=' + $(this).attr('dir');
+});
+
+$('#filelist').sortable().disableSelection();
+
+$('#dojoin').button().attr('disabled', true).addClass('ui-state-disabled')
+    .click(function() {
+	var files = $('#filelist').sortable('toArray');
+	var sfiles = new Array();
+	for (x in files)
+		sfiles.push(encodeURIComponent(files[x]));
+
+	$('#joindiv').hide('slow');
+	$('#progressdiv').show('slow');
+	handle = setInterval("update()", 1000);
+
+	$('#output').text('Please do not interrupt...')
+	    .load('/cgi-bin/browse/join_backend.jim?files=' +
+	    sfiles.join() + '&dest=' + $('#dest').val(),
+	    function() {
+		clearInterval(handle);
+		handle = 0;
+		$('#back').show();
+		$('#progressbar').reportprogress(100);
+	});
+});
+
+$('#dest').val('').keyup(function() {
+	if ($(this).val().length > 0)
+		$('#dojoin')
+		    .removeProp('disabled').removeClass('ui-state-disabled');
+	else
+		$('#dojoin')
+		    .prop('disabled', true).addClass('ui-state-disabled');
+});
+
+});
+</script>
+}
+
+footer
+

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

@@ -0,0 +1,32 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class pretty_size
+
+puts "Content-Type: text/html\r\n\r\n"
+
+cgi_input 1
+#cgi_dump
+
+set joinstart [clock milliseconds]
+
+set cmd {/mod/bin/nicesplice}
+set dst [file rootname [cgi_get dest "joined"]]
+
+foreach file [split [cgi_get files] ","] {
+	set file [cgi_unquote_input $file]
+	lappend cmd "-in" [file rootname $file]
+	set dir [file dirname $file]
+}
+lappend cmd "-out" "$dir/$dst"
+
+puts "($cmd)"
+puts [exec {*}$cmd]
+
+set ts [ts fetch "$dir/$dst.ts"]
+$ts settitle $dst
+
+set jointime [expr [expr [clock milliseconds] - $joinstart] / 1000.0]
+puts "Time taken: $jointime"
+

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

@@ -0,0 +1,23 @@
+#!/mod/bin/jimsh
+
+package require cgi
+#source /mod/var/mongoose/lib/setup
+
+puts "Content-Type: text/html\r\n\r\n"
+
+cgi_input
+#cgi_dump
+
+set expected [cgi_get esize 1]
+set file [file normalize [cgi_get file]]
+
+if {![file exists $file]} {
+	puts "0"
+} else {
+	set sz [file size $file]
+
+	set perc [expr $sz * 100 / $expected]
+	if {$perc > 100} { set perc 100 }
+	puts $perc
+}
+

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

@@ -0,0 +1,55 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class pretty_size
+
+puts "Content-Type: text/html\r\n\r\n"
+header
+
+cgi_input 1
+#cgi_dump
+set dir [cgi_unquote_input [cgi_get dir]]
+
+puts "<div id=deleting class=blood><img src=/img/loading.gif>Deleting...</div>"
+puts "<ul style=\"list-style-type: square\">"
+foreach file [split [cgi_get files] ","] {
+	set file [cgi_unquote_input $file]
+	puts -nonewline "<li>\"$file\"..."
+
+	if {[file isdirectory $file]} {
+		puts -nonewline "Directory..."
+		puts [exec /mod/bin/busybox/rm -rf $file]
+		puts -nonewline "Done..."
+	} elseif {[string match {*.ts} $file]} {
+		set ts [ts fetch $file]
+		if {[catch {$ts delete} msg]} {
+			puts -nonewline "Error loading TS file..."
+		} else {
+			puts -nonewline "Done..."
+		}
+	} else {
+		if {[catch {file delete $ts} msg]} {
+			puts -nonewline "Error: $msg"
+		} else {
+			catch {file delete "[file rootname $file].hmi"}
+			puts -nonewline "Done..."
+		}
+	}
+	puts "</li>"
+}
+puts "</ul>"
+puts "<button id=back dir=\"$dir\">Back to media list</button>";
+
+puts {
+<script type=text/javascript>
+$('#deleting').slideUp('slow');
+$('#back').button().click(function() {
+	window.location.href = '/cgi-bin/browse.jim?dir=' +
+	    encodeURIComponent($('#back').attr('dir'));
+});
+</script>
+}
+
+footer
+

var/mongoose/cgi-bin/cat.jim

@@ -0,0 +1,25 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require system.class chunked pretty_size
+
+cgi_input
+#cgi_dump
+
+set file [cgi_get file "-"]
+if {$file eq "-"} { exit }
+
+start_chunked
+
+if {![file exists $file]} {
+	chunk ">>> File $file does not exist.\r\n"
+} else {
+	chunk ">>> Contents of $file [pretty_size [file size $file]]\r\n"
+	set fp [open $file r]
+	chunk [read $fp]
+	close $fp
+}
+
+end_chunked
+

var/mongoose/cgi-bin/dedup.jim

@@ -74,6 +74,8 @@ foreach file [lsort [glob -nocomplain "$sdir"]] {
 		puts -nonewline "Cannot process"
 	} elseif {$base eq $fn} {
 		puts -nonewline "Nothing to do"
+	} elseif {[file exists "$dir/$fn.ts"]} {
+		puts -nonewline "Preserving"
 	} elseif {$doit} {
 		# Dooooo, it.
 		$ts settitle $syn

var/mongoose/cgi-bin/diag.jim

@@ -0,0 +1,33 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require system.class chunked
+
+cgi_input
+#cgi_dump
+
+set diag [cgi_get diag general]
+
+start_chunked
+
+if {[system modversion 1] < 113} {
+	chunk ">>> Diagnostics only available with customised firmware 1.13 or above."
+	end_chunked
+	exit
+}
+
+chunk ">>> Beginning diagnostic $diag\r\n"
+
+set bcmd "|/bin/diag $diag"
+set fd [open $bcmd r]
+while {[gets $fd line] >= 0} {
+	chunk "$line\r\n"
+	#chunk_pad
+}
+close $fd
+chunk "\r\n"
+chunk ">>> Ending diagnostic $diag\r\n"
+
+end_chunked
+

var/mongoose/cgi-bin/opkg.jim

@@ -9,17 +9,24 @@ cgi_input
 
 set cmd [cgi_get cmd update]
 
+proc opkg {cmd} {
+	chunk ">>> opkg $cmd\r\n"
+	set bcmd "|/mod/var/mongoose/lib/opkg $cmd"
+	set fd [open $bcmd r]
+	while {[gets $fd line] >= 0} {
+		chunk "$line\r\n"
+		#chunk_pad
+	}
+	close $fd
+	chunk "\r\n"
+}
+
 start_chunked
 
-set bcmd "|/mod/var/mongoose/lib/opkg $cmd"
-set fd [open $bcmd r]
-while {[gets $fd line] >= 0} {
-	chunk "$line\r\n"
-	#chunk_pad
-}
-close $fd
+if {$cmd eq "upgrade"} { opkg update }
+opkg $cmd
 
-if {$cmd eq "update"} {
+if {$cmd eq "update" || $cmd eq "upgrade"} {
 	chunk "Updating package meta information\r\n"
 	pkg fetchmeta
 	chunk "Done.\r\n"

var/mongoose/cgi-bin/settings.jim

@@ -58,6 +58,34 @@ if {[dict exists $_cgi pkgdevoff] && ![dict exists $_cgi pkgdev]} {
 }
 handle_int_update pkgdev $pkgdev "Development Package Display"
 
+set acluser [cgi_get acluser "-"]
+set aclpass [cgi_get aclpass "-"]
+set aclpassc [cgi_get aclpassc "-"]
+if {$acluser ne "-" && $aclpass ne "-"} {
+	if {![string length $acluser]} {
+		puts "No username provided."
+		exit
+	}
+	if {$aclpass ne $aclpassc} {
+		puts "Passwords do not match."
+		exit
+	}
+	if {[string length $aclpass] < 4} {
+		puts "Password is too short (< 4 characters)"
+		exit
+	}
+	puts [$settings addacluser $acluser $aclpass]
+	exit
+}
+
+set aclact [cgi_get aclact "-"]
+if {$aclact ne "-" && $acluser ne "-"} {
+	switch $aclact {
+		"del" { puts [$settings delacluser $acluser] }
+	}
+	exit
+}
+
 header
 
 puts {
@@ -194,6 +222,100 @@ puts "
 puts "
 	</table>
 	</fieldset>
+"
+
+puts "
+	<br><br>
+	<fieldset style=\"display: inline\">
+	<legend> Web Interface User Access Control </legend>
+	<table>
+"
+
+set aclusers [$settings aclusers]
+if {[llength $aclusers]} {
+	puts "<tr><th colspan=5 class=odd>Existing Users</th></tr>"
+	foreach user [$settings aclusers] {
+		lassign $user user
+		puts "<tr><td align=center style=\"font-weight: bold\">
+		    $user</td>"
+		puts "<th class=key>New password:
+	        <input
+		  class=\"aclpass text ui-widget-content ui-corner-all\"
+		  type=password size=20 maxlength=50><br>"
+		puts "Again:
+	        <input
+		  class=\"aclpassc text ui-widget-content ui-corner-all\"
+		  type=password size=20 maxlength=50></td>"
+		puts "<th class=key><button class=pwchange>
+		    Change</button></td>"
+		puts "<th class=key><button class=userdel>
+		    Delete User</button></td>"
+		puts "</tr>"
+	}
+	puts "<tr><td colspan=5 id=aclusermod_output>&nbsp;</td></tr>"
+	puts "<tr><td colspan=5>&nbsp;</td></tr>"
+} else {
+	puts "<tr><td colspan=5 class=blood><b>
+	    Add a user to enable authentication.</b></td></tr>"
+}
+
+puts "<tr><th colspan=5 class=odd>Add New User</th></tr>"
+puts "
+	<form id=aclnewuser method=get action=$env(REQUEST_URI)>
+	<tr><th class=key>New User:</th><td>
+	    <input
+		class=\"text ui-widget-content ui-corner-all\"
+		id=acluser name=acluser size=20 maxlength=50></td></tr>
+	<tr><th class=key>Password:</th><td>
+	    <input type=password
+		class=\"text ui-widget-content ui-corner-all\"
+		id=aclpass name=aclpass size=20 maxlength=50></td></tr>
+	<tr><th class=key>Password (confirm):</th><td>
+	    <input type=password
+		class=\"text ui-widget-content ui-corner-all\"
+		id=aclpassc name=aclpassc size=20 maxlength=50></td></tr>
+	<tr><td><input id=aclnewuser_submit value=\"Add User\" type=submit>
+	    </td></tr>
+	</form>
+	</table>
+	<div id=aclnewuser_output></div>
+	</fieldset>
+"
+
+puts {
+<script type=text/javascript>
+$('#aclnewuser').ajaxForm({
+	target: '#aclnewuser_output',
+	success: function(txt) {
+		if (txt.indexOf('Success') >= 0)
+			window.location.reload(true);
+	}
+});
+
+$('button.userdel').click(function(el) {
+	var user = $('td:first', $(this).parents('tr')).text().trim();
+	$('#aclusermod_output').load(
+	    '/cgi-bin/settings.jim?aclact=del&acluser=' +
+	    encodeURIComponent(user), function(txt) {
+		if (txt.indexOf('Success') >= 0)
+			window.location.reload(true);
+	});
+});
+
+$('button.pwchange').click(function(el) {
+	var tr = $(this).parents('tr');
+	var user = $('td:first', $(tr)).text().trim();
+	var pass = $(tr).find('input.aclpass').val();
+	var passc = $(tr).find('input.aclpassc').val();
+	$('#aclusermod_output').load('/cgi-bin/settings.jim?' +
+	    'acluser=' + encodeURIComponent(user) + '&' +
+	    'aclpass=' + encodeURIComponent(pass) + '&' +
+	    'aclpassc=' + encodeURIComponent(passc));
+});
+</script>
+}
+
+puts "
 	<br><br>
 	<fieldset style=\"display: inline\">
 	<legend> Advanced Settings </legend>

var/mongoose/html/css/jquery.contextMenu.css

@@ -54,9 +54,15 @@
 	classes to the respective LI element(s)
 */
 
-.contextMenu LI.edit A { background-image: url(images/page_white_edit.png); }
-.contextMenu LI.cut A { background-image: url(images/cut.png); }
-.contextMenu LI.copy A { background-image: url(images/page_white_copy.png); }
-.contextMenu LI.paste A { background-image: url(images/page_white_paste.png); }
-.contextMenu LI.delete A { background-image: url(images/page_white_delete.png); }
-.contextMenu LI.quit A { background-image: url(images/door.png); }
+.contextMenu LI.pwedit A { background-image: url(/img/context/page_white_edit.png); }
+.contextMenu LI.pwcopy A { background-image: url(/img/context/page_white_copy.png); }
+.contextMenu LI.pwpaste A { background-image: url(/img/context/page_white_paste.png); }
+.contextMenu LI.pwdelete A { background-image: url(/img/context/page_white_delete.png); }
+.contextMenu LI.edit A { background-image: url(/img/context/edit.png); }
+.contextMenu LI.copy A { background-image: url(/img/context/copy.png); }
+.contextMenu LI.paste A { background-image: url(/img/context/paste.png); }
+.contextMenu LI.delete A { background-image: url(/img/context/delete.png); }
+.contextMenu LI.cut A { background-image: url(/img/context/cut.png); }
+.contextMenu LI.quit A { background-image: url(/img/context/door.png); }
+
+

var/mongoose/html/css/style.css

@@ -258,3 +258,41 @@ input.text
 	background-color: yellow;
 }
 
+.focused
+{
+	border: 2px solid red;
+}
+
+div.cut, div.keep
+{
+	position: absolute;
+	top: 0px;
+	text-align: center;
+	overflow: hidden;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+}
+
+div.keep
+{
+	background: green;
+	color: white;
+}
+
+div.cut
+{
+	background: #ff4000;
+	color: black;
+}
+
+.ui-button-text
+{
+	font-size: inherit !important;
+}
+
+.ui-button, .ui-button-text
+{
+	padding: 0;
+	font-size: 12px;
+}
+

var/mongoose/html/diag.shtml

@@ -0,0 +1,38 @@
+<!--#include virtual="/lib/header.shtml" -->
+
+<fieldset style="display: inline; float: left; clear: left">
+<legend>Diagnostics</legend>
+Diagnostic:
+<input name=seq id=seq autocorrect=off autocapitalize=off
+    value=general size=30 maxlength=50
+    class="text ui-widget-content ui-corner-all">
+<button id=rundiag>Run Diagnostic</button>
+</fieldset>
+
+<fieldset style="display: inline; float: left; clear: left">
+<legend>Log Files</legend>
+<!--#exec cmd="/mod/var/mongoose/include/logfiles.jim" -->
+</fieldset>
+
+<div style="margin-top: 2em; display: none; float: left; clear: left"
+class=pre id=results></div>
+
+<script type=text/javascript>
+$('#rundiag').button().click(function() {
+	$('#results')
+	    .slideDown()
+	    .text('\n\nRunning diagnostic, please wait...\n\n')
+	    .load('/cgi-bin/diag.jim?diag=' +
+	    encodeURIComponent($('#seq').val()));
+});
+$('a.log').click(function() {
+	$('#results')
+	    .slideDown()
+	    .text('\n\nLoading log, please wait...\n\n')
+	    .load('/cgi-bin/cat.jim?file=' +
+	    encodeURIComponent($(this).attr('file')));
+});
+</script>
+
+<!--#include virtual="/lib/footer.shtml" -->
+

var/mongoose/html/index.shtml

@@ -65,7 +65,7 @@ $(document).ready(function() {
 <div style="float: left">
 	<center>
 	<a href=/services.shtml>
-	<img src=/img/spanner.jpg border=0 width=217 height=228>
+	<img src=/img/spanner.png border=0 width=217 height=228>
 	</a>
 	<br>
 	<a href=/services.shtml>
@@ -78,7 +78,7 @@ $(document).ready(function() {
 <div style="float: left">
 	<center>
 	<a href=/pkg.shtml>
-	<img src=/img/packages.jpg border=0 width=217 height=228>
+	<img src=/img/packages.png border=0 width=217 height=228>
 	</a>
 	<br>
 	<a href=/pkg.shtml>
@@ -111,6 +111,8 @@ $(document).ready(function() {
 <div class=footer>
 <ul>
 <li>
+<a href=/diag.shtml>Diagnostics</a>
+</li><li>
 <a href=/cgi-bin/channel.jim>Channel Information</a>
 </li><li>
 <a href=/cgi-bin/db.jim target=_blank>SQLite3 Database Dump</a>

var/mongoose/html/lib/header.jim

@@ -8,8 +8,8 @@ source /mod/var/mongoose/include/model.jim
 puts {
 </title>
 <link rel="shortcut icon" href=/img/favicon.ico />
-<link href=/css/style.css rel=stylesheet type=text/css />
 <link type="text/css" href="/css/jquery-ui.css" rel="Stylesheet" />     
+<link href=/css/style.css rel=stylesheet type=text/css />
 <script type="text/javascript" src="/js/jquery.js"></script>
 <script type="text/javascript" src="/js/jquery-ui.js"></script>
 </head>

var/mongoose/html/lib/header.shtml

@@ -5,8 +5,8 @@
 <meta http-equiv="expires" value="Thu, 01 Jan 1970 00:00:00 GMT" />
 <meta http-equiv="pragma" content="no-cache" />
 <link rel="shortcut icon" href=/img/favicon.ico />
-<link href=/css/style.css rel=stylesheet type=text/css />
 <link type="text/css" href="/css/jquery-ui.css" rel="Stylesheet" />     
+<link href=/css/style.css rel=stylesheet type=text/css />
 <script type="text/javascript" src="/js/jquery.js"></script>
 <script type="text/javascript" src="/js/jquery-ui.js"></script>
 </head>

var/mongoose/html/lib/topbar.jim

@@ -1,7 +1,7 @@
 puts {
 <!-- start of topbar -->
 
-<div class=container onclick="location.href='/'; return false;">
+<div id=topbar class=container onclick="location.href='/'; return false;">
 	<div class=left><img src=/images/154_1_00_WIN_MD116_1L.png></div>
 	<div class=middle>
 <!-- Start include diskspace - above other items to work around IE feature.. -->
@@ -19,6 +19,12 @@ puts {
 	</div>
 	<div class=right><img src=/images/154_1_00_WIN_MD116_3R.png></div>
 </div>
+<script type=text/javascript>
+$('#topbar').hover(
+    function() { $(this).css('cursor', 'pointer'); },
+    function() { $(this).css('cursor', 'auto'); }
+);
+</script>
 
 <!-- end of topbar -->
 }

var/mongoose/html/lib/topbar.shtml

@@ -1,6 +1,6 @@
 <!-- start of topbar -->
 
-<div class=container onclick="location.href='/'; return false;">
+<div id=topbar class=container onclick="location.href='/'; return false;">
 	<div class=left><img src=/images/154_1_00_WIN_MD116_1L.png></div>
 	<div class=middle>
 <!-- Start include diskspace - above other items to work around IE feature.. -->
@@ -13,5 +13,11 @@
 	</div>
 	<div class=right><img src=/images/154_1_00_WIN_MD116_3R.png></div>
 </div>
+<script type=text/javascript>
+$('#topbar').hover(
+    function() { $(this).css('cursor', 'pointer'); },
+    function() { $(this).css('cursor', 'auto'); }
+);
+</script>
 
 <!-- end of topbar -->

var/mongoose/include/logfiles.jim

@@ -0,0 +1,14 @@
+#!/mod/bin/jimsh
+
+source /mod/var/mongoose/lib/setup
+require pretty_size
+
+foreach file [concat \
+    [glob -nocomplain /tmp/*.log] \
+    [glob -nocomplain /mod/tmp/*.log] \
+] {
+	puts "<a href=# class=log file=\"$file\">
+	    <img border=0 height=14 src=/images/421_1_00_CH_Title_2R_Arrow.png>
+	    [file tail $file]</a> ([pretty_size [file size $file]]) <br>"
+}
+

var/mongoose/include/services.jim

@@ -3,11 +3,7 @@
 set services [split [exec /mod/bin/service mlist]]
 
 foreach service $services {
-	set data [split $service ":"]
-	set name [lindex $data 0]
-	set installed [lindex $data 1]
-	set auto [lindex $data 2]
-	set running [lindex $data 3]
+	lassign [split $service ":"] name installed auto running
 
 	puts "<tr><td class=even>$name</td>"
 	if (!$installed) {

var/mongoose/lib/epg.class

@@ -257,6 +257,17 @@ epg method next {} {
 	}
 }
 
+epg method previous {} {
+	set tm $($start - 60)
+	set prevlist [epg fetch dump -service $service_id -time $tm]
+
+	if {[llength prevlist] > 0} {
+		return [lindex $prevlist 0]
+	} else {
+		return ""
+	}
+}
+
 epg method recommended {} {
 	set rec ""
 	if {$rec_crid ne ""} {

var/mongoose/lib/rsv.class

@@ -65,6 +65,9 @@ rsv method name {} {
 	}
 	if {$name == ""} {
 		switch $ersvtype {
+		    1 { set name "--- Unnamed reminder ---" }
+		    2 { set name "--- Unnamed reminder ---" }
+		    3 { set name "--- Unnamed recording ---" }
 		    5 { set name "--- Wake-up ---" }
 		    6 { set name "--- Sleep ---" }
 		    7 { set name "--- Auto Update ---" }

var/mongoose/lib/settings.class

@@ -135,3 +135,76 @@ settings method channel_groups {} {
 	return $ret
 }
 
+settings method aclusers {} {
+	if {![file exists "/mod/etc/htpasswd"]} { return {} }
+	set fd [open "/mod/etc/htpasswd" r]
+	set users {}
+	foreach line [string trim [split [read $fd] "\n"]] {
+		set info [split $line ":"]
+		if {[llength $info] != 3} { continue }
+		lappend users $info
+	}
+	$fd close
+	return $users
+}
+
+settings method mongooseauth {{mode 1}} {
+	set fd [open "/mod/etc/mongoose.conf" r]
+	set fdnew [open "/mod/etc/mongoose.conf.new" w]
+	foreach line [string trim [split [read $fd] "\n"]] {
+		if {[string match -nocase {authentication_domain*} $line]} {
+			continue
+		}
+		if {[string match -nocase {global_passwords_file*} $line]} {
+			continue
+		}
+		if {$line ne ""} { puts $fdnew $line }
+	}
+	$fd close
+	if {$mode} {
+		puts $fdnew "authentication_domain webif"
+		puts $fdnew "global_passwords_file /mod/etc/htpasswd"
+	}
+	$fdnew close
+	file delete "/mod/etc/mongoose.conf"
+	file rename "/mod/etc/mongoose.conf.new" "/mod/etc/mongoose.conf"
+}
+
+settings method addacluser {user pass} {
+	set msg ""
+	if {![llength [$self aclusers]]} {
+		$self mongooseauth 1
+		append msg "Enabled web server authentication<br>"
+	}
+	set cmd "/mod/sbin/mongoose -A /mod/etc/htpasswd webif $user $pass"
+	exec {*}$cmd
+	append msg "Successfully updated user $user"
+	return $msg
+}
+
+settings method delacluser {user} {
+	if {![file exists "/mod/etc/htpasswd"]} { return }
+	set fd [open "/mod/etc/htpasswd" r]
+	set fdnew [open "/mod/etc/htpasswd.new" w]
+	set num 0
+	foreach line [string trim [split [read $fd] "\n"]] {
+		lassign [split $line ":"] xuser
+		if {$xuser eq $user} { continue }
+		if {$line ne ""} {
+			puts $fdnew $line
+			incr num
+		}
+	}
+	$fd close
+	$fdnew close
+	file delete "/mod/etc/htpasswd"
+	file rename "/mod/etc/htpasswd.new" "/mod/etc/htpasswd"
+	set msg "Successfully removed user $user"
+
+	if {$num == 0} {
+		$self mongooseauth 0
+		append msg "<br>Disabled web server authentication<br>"
+	}
+	return $msg
+}
+

var/mongoose/lib/system.class

@@ -21,13 +21,14 @@ proc {system hostname} {} {
 	return $hostname
 }
 
-proc {system modversion} {} {
+proc {system modversion} {{short 0}} {
 	if {[catch {set fp [open /etc/modversion r]}]} {
-		set modver "1.02"
+		set modver "102"
 	} else {
 		set modver [string trim [read $fp]]
 		close $fp
 	}
+	if {$short} { return $modver }
 	lassign [split $modver ""] a b c
 	return [format "%d.%d%d" $a $b $c]
 }
@@ -36,6 +37,19 @@ proc {system pkgver} {{pkg webif}} {
 	return [lrange [split [exec opkg list-installed $pkg] " "] 2 end]
 }
 
+proc {system pkginst} {pkg} {
+	if {[exec opkg list-installed $pkg] ne ""} {
+	    return 1 } else { return 0 }
+}
+
+proc {system mediaroot} {} {
+	switch [system model] {
+		HDR { return "/media/My Video" }
+		HD { return "/media/drive1/Video" }
+	}
+	return ""
+}
+
 proc {system diskspace} {} {
 	switch [system model] {
 		HDR { set part /mnt/hd2 }
@@ -61,7 +75,9 @@ proc {system diskspace} {} {
 
 proc {system busy} {} {
 	# Is humaxtv doing anything important?
-	set pid [exec /mod/bin/busybox/pgrep humaxtv]
+	if {[catch {set pid [exec /mod/bin/busybox/pgrep humaxtv]}]} {
+		return 0
+	}
 	set c 0
 	foreach line [split [exec /mod/bin/lsof -p $pid] "\n"] {
 		if {[string match {*Video*.ts} $line]} { incr c }

var/mongoose/lib/ts.class

@@ -1,6 +1,8 @@
 
 if {![exists -proc class ]} { package require oo }
 
+set dmsfile /mnt/hd2/dms_cds.db
+
 class ts {
 	file		""
 	base		""
@@ -14,10 +16,13 @@ class ts {
 	flags		""
 	error		""
 	guidance	""
+	bookmarks	0
 }
 
-ts method duration {} {
-	return [expr [expr $end - $start] / 60]
+ts method duration {{raw 0}} {
+	set d [expr $end - $start]
+	if {!$raw} { set d $($d / 60) }
+	return $d
 }
 
 ts method size {} {
@@ -28,15 +33,15 @@ ts method size {} {
 ts method _parse {line} {
 	set vars [split $line "\t"]
 
-	set title [lindex $vars 0]
-	set synopsis [lindex $vars 1]
-	set definition [lindex $vars 2]
-	set channel_num [lindex $vars 3]
-	set channel_name [lindex $vars 4]
-	set start [lindex $vars 5]
-	set end [lindex $vars 6]
-	set flags [split [string range [lindex $vars 7] 0 end-1] ,]
-	set guidance [lindex $vars 8]
+	lassign [split $line "\t"] \
+	    title synopsis definition channel_num channel_name \
+	    start end flags_list guidance bookmarks
+
+	set flags [split [string range $flags_list 0 end-1] ,]
+}
+
+ts method bookmarks {} {
+	return [exec /mod/bin/hmt -bookmarks $file]
 }
 
 ts method flag {f} {
@@ -125,6 +130,27 @@ ts method settitle {newtitle} {
 	exec /mod/bin/hmt "+settitle=${newtitle}" $file
 }
 
+ts method dlnaloc {} {
+	set mime "video/ts"
+	if {![file exists $::dmsfile]} { return {} }
+	if {[catch {set db [sqlite3.open $::dmsfile]}]} { return {} }
+	set url ""
+	set rfile [file normalize $file]
+	set muri [$db query "
+		select tblresource.mimetype, contenturi
+		from tblresource join tblmedia using (mediaid)
+		where localurl = '%s'" $rfile]
+	if {$muri ne ""} {
+		set rec [lindex $muri 0]
+		set xuri [lindex $rec 3]
+		set mime [lindex $rec 1]
+		set url "http://$::env(HTTP_HOST):9000/web/$xuri"
+	}
+	$db close
+
+	if {$url ne "" } { return [list $url $mime] } else { return {} }
+}
+
 proc {ts renamegroup} {from to} {
 	set dir [file dirname $from]
 	set root [file rootname $from]
@@ -141,5 +167,22 @@ proc {ts renamegroup} {from to} {
 		#puts "rename $f \"${dir}/${to}${ext}\""
 		file rename $f "${dir}/${to}${ext}"
 	}
+
+	exec /mod/bin/hmt "+setfilename=$to" "${dir}/${to}.hmt"
+
+	set ndir [file normalize $dir]
+
+	if {![catch {set db [sqlite3.open $::dmsfile]}]} {
+		set x [lindex [$db query {select mediaid from tblMedia
+		    where localUrl = '%s'} [file normalize $from]] 0]
+		lassign $x key mediaid
+		if {$mediaid ne ""} {
+			$db query {update tblMedia set localUrl = '%s'
+			    where mediaid = %s} "${ndir}/{$to}.ts" $mediaid
+			$db query {update tblMedia set title = '%s'
+			    where mediaid = %s} "{$to}.ts" $mediaid
+		}
+	$db close
+	}
 }