version 0.7.6

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

CONTROL/control

@@ -1,10 +1,11 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 0.5.1
+Version: 0.7.6
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
-Depends: mongoose(>=2.11-4),jim-sqlite3,jim-cgi,service-control,busybox,lsof,jim-oo,epg(>=1.0.2)
+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
 Replaces: af123-webif
 Conflicts: af123-webif
-Description: A web interface for the Humax. In development.
+Suggests: ffmpeg,webif-iphone
+Description: An evolving web interface for the Humax.

etc/init.d/S60parseepg

@@ -0,0 +1,43 @@
+#!/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
+else
+	epg=/media/drive1/epgsavedata
+	epgdb=/media/drive1/epg.db
+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
+		) &
+		;;
+	stop)
+		;;
+	*)
+		exit 1
+		;;
+esac
+

var/mongoose/cgi-bin/backup/backup.jim

@@ -0,0 +1,75 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+
+require rsv.class
+
+set dir /mod/var/backup
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+if {![dict exists $_cgi file]} {
+	puts "No filename supplied."
+	exit
+}
+
+set file [file tail [dict get $_cgi file]]
+set ffile "/$dir/$file.rbk"
+
+if {[file exists $ffile]} {
+	puts "Backup file <i>$file</i> already exists."
+	exit
+}
+
+if {[catch { set fd [open $ffile w] } msg]} {
+	puts "Error creating backup file. - $msg"
+	exit
+}
+
+puts "Backing up scheduled recordings and events..."
+
+set events [rsv list]
+
+set fields [lsort [[rsv] vars]]
+
+#puts $fd "# [join $fields "\t"]"
+
+foreach event $events {
+	puts "  Backing up scheduled event '[$event name]'"
+	puts -nonewline $fd "event\t"
+
+	foreach f $fields {
+		if {$f eq "aulEventToRecordInfo"} { continue }
+		puts -nonewline $fd "[$event get $f]\t"
+	}
+	puts $fd ""
+}
+puts "Done."
+
+puts "Backing up channel favourites..."
+
+set grp 0
+foreach res [$rsvdb query {
+	select	eFavGroup,
+		TBL_FAV.eSvcType,
+		substr(szSvcName, 2) as szSvcName
+	from TBL_FAV join TBL_SVC using (hSvc)
+	order by eFavGroup
+    }] {
+	if {$res(eFavGroup) != $grp} {
+		set grp $res(eFavGroup)
+		puts "  Group $grp"
+	}
+	puts "    $res(szSvcName)"
+	puts $fd "fav\t$res(eFavGroup)\t$res(eSvcType)\t$res(szSvcName)"
+}
+puts "Done."
+
+close $fd
+rsv cleanup
+

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

@@ -0,0 +1,59 @@
+
+function refresh_files()
+{
+	$('#backup_files').load('/cgi-bin/backup/files.jim', function() {
+		$('input.restore').change(function() {
+			$('#restore_button').removeAttr('disabled')
+			    .button('option', 'disabled', false);
+			$('#delete_button').removeAttr('disabled')
+			    .button('option', 'disabled', false);
+		});
+	});
+}
+
+$(document).ready(function() {
+	$('button').button();
+
+	refresh_files();
+
+	$('#backup_button').click(function() {
+		$('#backup_working').slideDown();
+		$('#results').load('/cgi-bin/backup/backup.jim?' +
+		    $('#backup_name').serialize(), function() {
+			$('#results').slideDown(function() {
+				$('#backup_working').slideUp();
+				refresh_files();
+			});
+		});
+	});
+	$('#delete_button').click(function() {
+		var backup = $('input.restore:checked').val();
+		if (confirm('Confirm deletion of ' + backup))
+		{
+			$('#results').load('/cgi-bin/backup/delete.jim?' +
+			    $('input.restore').serialize(), function() {
+				$('#results').slideDown(function() {
+					refresh_files();
+				});
+			});
+		}
+	});
+	$('#restore_button').click(function() {
+		var backup = $('input.restore:checked').val();
+		if (confirm('!!!!!!!!!!!!!!!!!!!!!!!!! PLEASE CONFIRM !!!!!!!!!!!!!!!!!!!!!!!!!\n\nAre you sure you wish to erase all scheduled recordings and favourite channels and then restore them from\n' + backup + '?'))
+		{
+			$('#restore_working').slideDown();
+			$('#results').load('/cgi-bin/backup/restore.jim?' +
+			    $('input.restore').serialize(), function() {
+				$('#results').slideDown(function() {
+					$('#restore_working').slideUp();
+					refresh_files();
+					$('#restore_warning').slideDown();
+					$('#restart_block').load(
+					    '/cgi-bin/restartblock.jim');
+				});
+			});
+		}
+	});
+});
+

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

@@ -0,0 +1,31 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+
+set dir /mod/var/backup
+
+puts "Content-Type: text/html"
+puts "Pragma: no-cache"
+puts "Expires: Thu, 01 Jan 1970 00:00:00 GMT"
+puts ""
+
+cgi_input
+#cgi_dump
+
+if {![dict exists $_cgi restore_file]} {
+	puts "No filename supplied."
+	exit
+}
+
+set file [file tail [dict get $_cgi restore_file]]
+set ffile "/$dir/$file.rbk"
+
+if {![file exists $ffile]} {
+	puts "Backup file <i>$file</i> does not exist."
+} elseif {[catch { file delete $ffile } msg]} {
+	puts "Deletion failed: $msg"
+} else {
+	puts "Successfully deleted <i>$file</i>"
+}
+

var/mongoose/cgi-bin/backup/files.jim

@@ -0,0 +1,39 @@
+#!/mod/bin/jimsh
+
+package require cgi
+
+puts "Content-Type: text/html"
+puts "Pragma: no-cache"
+puts "Expires: Thu, 01 Jan 1970 00:00:00 GMT"
+puts ""
+
+set dir "/mod/var/backup"
+
+proc empty {} {
+	puts "<font style=\"color: grey\">
+		<i>No current backup files.</i>
+	      </font>"
+}
+
+if {![file isdirectory $dir]} {
+	empty
+	exit
+}
+
+set backups [glob -nocomplain "$dir/*.rbk"]
+
+if {![llength $backups]} {
+	empty
+	exit
+}
+
+foreach backup $backups {
+	set b [file rootname [file tail $backup]]
+	puts "<input name=restore_file class=restore
+	    type=radio value=\"$b\">$b <font class=footnote>(
+		[clock format [file mtime $backup] -format {%c %Z}]
+	    )</font></input>
+		<br>
+	"
+}
+

var/mongoose/cgi-bin/backup/restore.jim

@@ -0,0 +1,128 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+
+require rsv.class findhsvc system.class
+
+set dir /mod/var/backup
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+#set _cgi(restore_file) "backup-2011-Jul-09-20:37"
+
+if {![dict exists $_cgi restore_file]} {
+	puts "No filename supplied."
+	exit
+}
+
+set file [file tail [dict get $_cgi restore_file]]
+set ffile "/$dir/$file.rbk"
+
+if {![file exists $ffile]} {
+	puts "Backup file <i>$file</i> does not exist."
+	exit
+}
+
+if {[catch { set fd [open $ffile r] } msg]} {
+	puts "Error opening <i>$file</i> - $msg"
+	exit
+}
+
+puts "Restoring scheduled events from <i>$file</i>..."
+
+$rsvdb query {begin transaction;}
+$rsvdb query {delete from TBL_RESERVATION;}
+
+set fields [lsort [[rsv] vars]]
+
+set data [split [read $fd] "\n"]
+
+foreach line $data {
+	set vals [split $line "\t"]
+	if {[lindex $vals 0] ne "event"} { continue }
+	set vars {}
+	set i 0
+	foreach f $fields {
+		if {$f eq "aulEventToRecordInfo"} { continue }
+		incr i
+		lappend vars $f [lindex $vals $i]
+	}
+
+	set rsv [rsv new $vars]
+
+	# Need to fix up channel and CRID mappings in case something has
+	# changed during a channel scan.
+
+	puts "  Restoring [$rsv name]"
+
+	set bad 0
+	# First, the service number
+	set ohsvc [$rsv get hsvc]
+	if {$ohsvc > 0} {
+		set hsvc [$rsv fix_hsvc]
+		if {$hsvc == 0} {
+			puts "    Cannot find channel, restore failed."
+			set bad 1
+		} elseif {$hsvc != $ohsvc} {
+			puts -nonewline "    Service number has "
+			puts "changed $ohsvc -> $hsvc, fixing."
+		} else {
+			puts "    No change in channel service."
+		}
+	}
+
+	if {!$bad} {
+		if {[catch {$rsv insert pending 1} msg]} {
+			puts "    Error inserting event, $msg"
+		}
+	}
+}
+
+$rsvdb query {commit transaction;}
+
+puts "Restoring favourite channels..."
+$rsvdb query {begin transaction;}
+$rsvdb query {delete from channel.TBL_FAV}
+
+set grp 0
+foreach line $data {
+	set vals [split $line "\t"]
+	if {[lindex $vals 0] ne "fav"} { continue }
+
+	set group [lindex $vals 1]
+	set type [lindex $vals 2]
+	set chan [lindex $vals 3]
+	set hsvc [get_channel_attr $chan]
+
+	if {$grp != $group} {
+		set grp $group
+		puts "  Group $grp"
+	}
+
+	puts "    $chan"
+
+	if {!$hsvc} {
+		puts "        Cannot map channel name to service."
+		continue
+	}
+
+	set query "
+		insert into channel.TBL_FAV(hSvc, eFavGroup, eSvcType)
+		values($hsvc, $group, $type);
+	"
+
+	$rsvdb query $query
+}
+
+$rsvdb query {commit transaction;}
+
+system restartpending
+
+close $fd
+rsv cleanup
+

var/mongoose/cgi-bin/browse.jim

@@ -1,74 +1,33 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/ts.class
+source /mod/var/mongoose/lib/setup
+require ts.class pretty_size
 
 puts "Content-Type: text/html"
 puts ""
 
 set ignore {.nts .thm .hmt .hmi}
-set standard {.avi .mpg .wmv .mkv}
+set include {.ts .avi .mpg .mpeg .wmv .mkv .mp3 .mp4 .mov}
 
 cgi_input
 #cgi_dump
 
-#set _cgi(tsfile) "/media/My Video/Family Guy/2.19._Excellence_in_Broadcasting.ts"
-#set _cgi(action) "delete"
 #set env(REQUEST_URI) ''
-
-proc tsfile {file bfile {ajax 0}} {{i 0}} {
-	set ts [ts fetch $file]
-	if {$ajax == 0} { puts "<div class=\"va tsfile\" id=[incr i]>" }
-	puts "
-	      <a class=ts file=\"$file\" href=#>
-		<img class=va border=0 width=45
-		  src=/images/741_1_10_Video_Title.png>
-		  $bfile
-	      </a>
-	"
-	if {[$ts get definition] eq "HD"} {
-		puts "<img class=va src=/images/172_1_00_HD.png height=21>"
-	} else {
-		puts "<img class=va src=/images/172_1_26_SD.png height=21>"
-	}
-	set locked 0
-	if {[$ts flag "Locked"] > 0} {
-		set locked 1
-		puts "<img class=va src=/images/178_1_00_Icon_Lock.png
-		    height=21>"
-	}
-
-	puts "
-	      <a class=tsopt file=\"$file\" href=#>
-		<img class=\"opt va\" border=0 width=45 did=$i locked=$locked
-		    src=/images/181_1_00_Help5_OPT_Plus.png>
-	      </a>
-	    <div class=\"results blood\" style=\"margin: 0 0 0 5em\"></div>
-	"
-	if {$ajax == 0} { puts "</div>" }
-}
-
-proc genfile {file bfile} {
-	puts "
-	    <div class=va>
-	      <a href=#>
-		<img class=va border=0 width=45 style=\"padding: 0.3em 0\"
-		  src=/images/743_4_10_Video_Xvid_File.png>
-		  $bfile
-	      </a>
-	    </div>
-	"
-}
+#set _cgi(dir) "/media/My Video/Chuggington"
 
 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 src=/images/711_1_09_Media_Folder.png>"
-	puts "$bfile</a></div>"
+	puts "<img border=0 class=va id=\"img$tbfile\"
+	    src=/images/711_1_09_Media_Folder.png>"
+	puts "$bfile</a><span class=filesize id=\"$tbfile\">
+		</span></div>"
 }
 
-proc entry {file {ajax 0}} {
-	set bfile [lindex [split $file /] end]
+proc entry {file} {{i 0}} {
+	set bfile [file tail $file]
 	if {[string index $bfile 0] == "\025"} {
 		set bfile [string range $bfile 1 end]
 	}
@@ -77,94 +36,97 @@ proc entry {file {ajax 0}} {
 		continue
 	}
 	set ext [file extension $file]
-	if {$ext eq ".ts"} {
-		tsfile $file $bfile $ajax
-		continue
-	}
-	if {$ext in $::ignore} { continue }
-	if {$ext in $::standard} {
-		genfile $file $bfile
-		continue
-	}
-}
+	if {$ext in $::ignore || $ext ni $::include} { continue }
 
-if {[dict exists $_cgi tsfile]} {
-	set file [dict get $_cgi tsfile]
-	set ts [ts fetch $file]
+	file stat $file st
+	set sz [pretty_size $st(size)]
 
-	if {[dict exists $_cgi action]} {
-		switch [dict get $_cgi action] {
-		    entry {
-			entry $file 1
-		    }
-		    delete {
-			if {[$ts delete]} {
-				puts "Successfully deleted $file."
-			} else {
-				puts "Problem deleting $file, [$ts get error]"
-			}
-		    }
-		    lock {
-			set action lock
-			if {[$ts flag "Locked"]} { set action unlock }
-			if {[$ts $action]} {
-				puts "Successfully [set action]ed $file."
-			} else {
-				puts "Problem [set action]ing $file,
-				    [$ts get error]"
-			}
-		    }
-		}
-		exit
+	set base [file rootname $file]
+
+	if {$ext eq ".ts" && [file exists "${base}.nts"]} {
+		set type ts
+		set ts [ts fetch $file 1]
+		set img Video_TS
+	} else {
+		set type gen
+		set ts 0
+		set img Video_Other
 	}
 
-	source /mod/var/mongoose/lib/epg.class
-
 	puts "
-<table class=keyval>
-<tr>
-	<th>Title</th>
-	<td>[$ts get title]</td>
-</tr><tr>
-	<th>Synopsis</th>
-	<td>[$ts get synopsis]</td>
-</tr><tr>
-	<th>Definition</th>
-	<td>
+	    <div class=\"va bf\" id=[incr i]>
+	      <a class=bf file=\"$file\" type=$type href=#>
 	"
-	if {[$ts get definition] eq "HD"} {
-		puts "<img class=va src=/images/172_1_00_HD.png height=21>"
+
+	set new 0
+	if {$type eq "ts"} {
+		if {[$ts flag "New"] > 0} { set new 1 }
 	} else {
-		puts "<img class=va src=/images/172_1_26_SD.png height=21>"
+		if {![file exists "[file rootname $file].hmi"]} { set new 1 }
 	}
-	puts "</td>
-</tr><tr>
-	<th>Channel</th>
-	<td>[epg channelicon [$ts get channel_name] 50 "vertical-align: middle"]
-	    [$ts get channel_num] - [$ts get channel_name]</td>
-</tr><tr>
-	<th>Start Time</th>
-	<td>"
-	puts [clock format [$ts get start] -format "%c %Z"]
-	puts "</td>
-</tr><tr>
-	<th>End Time</th>
-	<td>"
-	puts [clock format [$ts get end] -format "%c %Z"]
-	puts "</td>
-</tr><tr>
-	<th>Duration</th>
-	<td>[$ts duration] minute(s).</td>
-</tr><tr>
-	<th>Size</th>
-	<td>[$ts size] MiB</td>
-</tr><tr>
-	<th>Flags</th>
-	<td>[$ts get flags]</td>
-</tr>
-</table>
+
+	if {$new} { append img _New }
+
+	puts "<img class=va border=0 src=/img/$img.png>"
+
+	puts "
+		$bfile
+	      </a>
 	"
-	exit
+
+	# Size
+	puts "<span class=filesize> ($sz) </span>"
+
+	# Icons
+
+	set locked 0
+	set encd 0
+	set def unknown
+	if {$type eq "ts"} {
+		# HD / SD
+		if {[$ts get definition] eq "HD"} {
+			set def HD
+			set img "172_1_00_HD"
+		} else {
+			set def SD
+			set img "172_1_26_SD"
+		}
+		puts "<img class=va src=/images/$img.png height=21>"
+
+		# Locked
+		if {[$ts flag "Locked"] > 0} {
+			set locked 1
+			puts "<img class=va src=/images/178_1_00_Icon_Lock.png
+			    height=21>"
+		}
+
+		# Encrypted
+		if {[$ts flag "Encrypted"] > 0} {
+			set encd 1
+			puts "<img class=va
+			    src=/images/749_1_26_Video_Encryption.png
+			    height=21>"
+		}
+
+		# Guidance
+		if {[$ts flag "Guidance"] > 0} {
+			puts "<img class=va
+			    src=/images/174_1_26_GuidancePolicy.png
+			    height=21>"
+		}
+	}
+
+	# Opt+ button
+
+	puts "
+	      <a href=#>
+		<img class=\"opt va\" border=0 width=45 type=$type did=$i
+		    locked=$locked encd=$encd def=$def new=$new
+		    src=/images/181_1_00_Help5_OPT_Plus.png>
+	      </a>
+	    <div class=\"results blood\" style=\"margin: 0 0 0 5em\"></div>
+	"
+	puts "</div>"
 }
 
 if {[dict exists $_cgi dir]} {
@@ -173,179 +135,144 @@ if {[dict exists $_cgi dir]} {
 	set dir "/media/My Video"
 }
 
-source /mod/var/mongoose/html/lib/header.jim
+######################################################################
+# Render web page
 
+header
+
+puts { 
+	<link href=/css/jquery.contextMenu.css rel=stylesheet type=text/css />
+	<script type="text/javascript" src="/js/jquery.contextMenu.js"></script>
+
+	<ul id=optmenu class=contextMenu>
+		<li><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>
+	</ul>
+
+	<div id=renameform title="Rename media file" style="display: none">
+		<form id=renameform_form>
+		<input type=hidden name="renameorig" id="renameorig" value="">
+		<input type=hidden name="titleorig" id="titleorig" value="">
+		<table border=0>
+		<tr>
+		<th>
+			<label for="rename">
+				<b>New Filename</b>
+			</label>
+		</th>
+		<td>
+			<input type=text name="rename" id="rename"
+			    value="" size=70 maxlength=255
+			    class="text ui-widget-content ui-corner-all">
+		</td>
+		</tr>
+		<tr style="display: none" class=tstype>
+		<th>
+			<label for="renametitle" style="padding-top: 0.5em">
+				<b>New EPG Title</b>
+			</label>
+		</th>
+		<td>
+			<input type=text name="renametitle" id="renametitle"
+			    value="" size=70 maxlength=48
+			    class="text ui-widget-content ui-corner-all">
+		</td>
+		</tr>
+		<tr style="display: none" class=tstype>
+		<td colspan=2 id=synopsis style="font-style: italic"></td>
+		</tr>
+		</table>
+		</form>
+	</div>
+
+	<div id=savestreamform title="Save streamed content"
+	    style="display: none">
+		<div class=pre id=savestream_detail></div>
+		<form id=savestream_form>
+}
+puts "<input type=hidden name=dir value=\"$dir\">"
 puts {
+		<table border=0>
+		<tr>
+		<th>
+			<label for="savestream_name">
+				<b>Filename</b>
+			</label>
+		</th>
+		<td>
+			<input type=text name="savestream_name"
+			    id="savestream_name"
+			    value="" size=70 maxlength=255
+			    class="text ui-widget-content ui-corner-all">
+			<img id=savestream_spin src=/img/loading.gif>
+		</td>
+		</tr>
+		</table>
+		</form>
+	</div>
 
-<link href=/css/jquery.contextMenu.css rel=stylesheet type=text/css />
-<script type="text/javascript" src="/js/jquery.contextMenu.js"></script>
+	<div id=dialogue></div>
+	<div id=confirm title="Confirmation Required"></div>
 
-<ul id=optmenu class=contextMenu>
-	<li><a href=#delete>Delete</a></li>
-	<li><a href=#lock>Toggle Lock</a></li>
-	<li><a href=#rename>Rename</a></li>
-	<li><a href=#title>Change Title</a></li>
-</ul>
-
-<div id=dialogue></div>
-<div id=confirm title="Confirmation Required"></div>
-
-<script type=text/javascript>
-	function bindmenu(selector)
-	{
-		$(selector).contextMenu(
-			{
-				menu: 'optmenu',
-				leftButton: true,
-				beforeShow:
-function(el, menu)
-{
-	if (el.attr('locked') == 1)
-	{
-		$(menu).changeContextMenuItem('#lock', 'Unlock');
-		$('#optmenu').disableContextMenuItems('#delete');
-	}
-	else
-	{
-		$(menu).changeContextMenuItem('#lock', 'Lock');
-		$('#optmenu').enableContextMenuItems('#delete');
-	}
-}
-			},
-function (action, el, pos)
-{
-	var ts = $(el).parent().prevAll('a.ts').last().attr('file');
-	var did = $(el).attr('did');
-	switch (action)
-	{
-	    case 'delete':
-		confirm_action('delete', delete_callback, ts, did);
-		break;
-
-	    case 'lock':
-		confirm_action('change the lock on', lock_callback, ts, did);
-		break;
-
-	    default:
-		alert('Unhandled action: ' + action);
-		break;
-	}
-}
-		);
-	}
-
-	var $confirm = $('#confirm').dialog({
-		modal: true, autoOpen: false,
-		height: 160, width: 500,
-		show: 'fade', hide: 'fade',
-		draggable: false, resizable: false
-	});
-
-	var confirm_action = function(action, callback, ts, id) {
-		var bts = ts.replace(/.*\/|\.[^.]*$/g, '');
-		$confirm.dialog('option', 'buttons', {
-			'Yes': function() { $(this).dialog('close');
-				callback(ts, id); },
-			'No':  function() {$(this).dialog('close');}
-
-		});
-		$('#confirm').empty().html(
-		    'Are you sure you wish to ' + action + '<br>' +
-		    '<i>' + bts + '</i> ?'
-		);
-		$confirm.dialog('open');
-	}
-
-	var delete_callback = function(ts, id) {
-		var el = 'div.tsfile#' + id;
-		var results = el + ' .results';
-		var url = window.location.pathname + '?tsfile=' +
-		    encodeURIComponent(ts) + '&action=delete';
-		$(results).load(url, function() {
-			$(el).delay(3000).slideUp(300, function() {
-				$(el).remove();
-			});
-		});
-	}
-
-	var lock_callback = function(ts, id) {
-		var el = 'div.tsfile#' + id;
-		var results = el + ' .results';
-		var url = window.location.pathname + '?tsfile=' +
-		    encodeURIComponent(ts) + '&action=';
-
-		$(results).load(url + 'lock', function() {
-			$(results).delay(3000).slideUp(150,
-			    function() {
-				$(el).load(url + 'entry', function() {
-					bindmenu(el + ' img.opt');
-				});;
-			    }
-			);
-		});
-	}
-
-	// Dialogue init
-	var $dialog = $('#dialogue').dialog({
-		title: "Recording Details",
-		modal: false, autoOpen: false,
-		height: 600, width: 700,
-		show: 'scale', hide: 'fade',
-		draggable: true, resizable: true,
-		buttons: { "Close":
-		    function() {$(this).dialog('close');}},
-		close: function(e,u) { $('#dialogue').empty().html(
-		    '<img src="/img/loading.gif" alt="loading">'); }
-	});
-
-	$(document).ready(function() {
-
-		$('#optmenu').disableContextMenuItems('#rename,#title');
-		bindmenu('img.opt');
-
-		$('a.ts').click(function(e) {
-			e.preventDefault();
-			var file = $(this).attr('file');
-			var url = window.location.pathname + '?tsfile=' +
-			    encodeURIComponent(file);
-			$('#dialogue').load(url);
-			$dialog.dialog('open');
-		});
-
-	});
-</script>
+	<script type=text/javascript src=/cgi-bin/browse/browse.js></script>
 }
 
-puts { <div style="border: 1px solid grey; padding: 1em"> }
+puts "<span style=\"display:none\" id=dir>$dir</span>"
 
 # Breadcrumb path
-puts "<h1>"
+puts "
+      <fieldset style=\"margin: 1em\">
+      <legend style=\"font-size: 1.5em; padding: 0 0.5em 0.5em 0.5em;\">
+"
 set stub ""
 foreach part [split $dir /] {
 	if {$stub eq "/"} { set name $part } else { set name "/$part" }
 	append stub $name
 	puts "<a href=$env(REQUEST_URI)?dir=[cgi_quote_url $stub]>$name</a>
 }
-puts "</h1>"
+puts "<span class=filesize id=dirsize></span>"
+puts "</legend>"
 
+# Parent directory
 set parent [join [lrange [split $dir /] 0 end-1] /]
 if {$parent ne ""} {
 	puts "
 	    <div class=va>
 		<a href=$env(REQUEST_URI)?dir=[cgi_quote_url $parent]>
-		<img src=/images/711_3_09_Media_Folder_UP.png class=va>
+		<img border=0 src=/images/711_3_09_Media_Folder_UP.png class=va>
 			\[parent directory\]</a>
 	    </div>
 	"
 }
 
+# Strip double slashes
 regsub -all -- {\/+} "$dir/*" "/" dir
 
 foreach file [lsort [glob -nocomplain "$dir"]] {
 	entry $file
 }
 
-puts "</div>"
+puts "</fieldset>"
 
-source /mod/var/mongoose/html/lib/footer.jim
+# De-duplicate
+
+puts {
+	<small><button id=dedup>De-duplicate/tidy this folder</button></small>
+}
+
+# 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>
+}
+}
+
+footer
 

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

@@ -0,0 +1,325 @@
+
+function epginfo_callback(data, status, xhr)
+{
+	var width = 85;
+
+	if (status != 'success')
+		return;
+
+	//console.log(status);
+	//console.dir(data);
+
+	$('#titleorig').val(data.title);
+	$('#renametitle').val(data.title);
+	if (data.synopsis.length > width)
+		data.synopsis = data.synopsis.substring(0, width) + '...';
+	$('#synopsis').html(data.synopsis);
+	$('tr.tstype').show('slow');
+}
+
+function insert_folder_size(folder, size)
+{
+	folder = folder.replace(/ /g, '');
+	folder = folder.replace(/([ #;&,.+*~\':"!^$[\]()=>|\/@])/g, '\\$1');
+	//console.log("Folder: (%s) = (%s)", folder, size);
+	if (folder == "")
+		$('#dirsize').text(' (' + size + 'iB)');
+	else
+		$('#' + folder).text(' (' + size + 'iB)');
+}
+
+function folder_size_callback(data, status, xhr)
+{
+	//console.log("Status: %s", status);
+	//console.dir(data);
+	$.each(data, insert_folder_size);
+}
+
+function set_folder_new(folder, cnt)
+{
+	folder = folder.replace(/ /g, '');
+	folder = folder.replace(/([ #;&,.+*~\':"!^$[\]()=>|\/@])/g, '\\$1');
+	//console.log("Folder: (%s) = (%s)", folder, cnt);
+	$('#img' + folder).attr('src', '/img/Folder_New.png');
+}
+
+function new_folder_callback(data, status, xhr)
+{
+	//console.log("Status: %s", status);
+	//console.dir(data);
+	$.each(data, set_folder_new);
+}
+
+function delete_callback(file, type, id)
+{
+	var el = 'div.bf#' + id;
+	var results = el + ' .results';
+	var url = '/cgi-bin/browse/delete.jim?file=' +
+	    encodeURIComponent(file) + '&type=' + type;
+	$(results).load(url, function() {
+		$(el).delay(3000).slideUp(300, function() {
+			$(el).remove();
+		});
+	});
+}
+
+function lock_callback(file, type, id)
+{
+	var url = '/cgi-bin/browse/lock.jim?file=' + encodeURIComponent(file);
+	$.get(url, function() { window.location.reload(true); });
+}
+
+function enc_callback(file, type, id)
+{
+	var url = '/cgi-bin/browse/enc.jim?file=' + encodeURIComponent(file);
+	$.get(url, function() { window.location.reload(true); });
+}
+
+function new_callback(file, type, id)
+{
+	var url = '/cgi-bin/browse/new.jim?file=' + encodeURIComponent(file);
+	$.get(url, function() { window.location.reload(true); });
+}
+
+function rename_submit()
+{
+	var s = $('#renameform_form').serialize();
+	$.get('/cgi-bin/browse/rename.jim?' + s,
+	    function() { window.location.reload(true); });
+}
+
+function savestream_submit()
+{
+	var s = $('#savestream_form').serialize();
+	var sf = $('#save_stream').attr('file');
+	$('#savestream_spin').show();
+	$.get('/cgi-bin/browse/savestream.jim?sfile=' +
+	    encodeURIComponent(sf) + '&' + s,
+	    function() {
+		window.location.reload(true);
+	    });
+}
+
+var $confirm;	// Populated after DOM is loaded.
+
+function confirm_action(action, callback, file, type, id)
+{
+	var bfile = file.replace(/.*\/|\.[^.]*$/g, '');
+	$confirm.dialog('option', 'buttons', {
+		'Yes': function() { $(this).dialog('close');
+			callback(file, type, id); },
+		'No':  function() {$(this).dialog('close');}
+
+	});
+	$('#confirm').empty().html(
+	    'Are you sure you wish to ' + action + '<br>' +
+	    '<i>' + bfile + '</i> ?'
+	);
+	$confirm.dialog('open');
+}
+
+function preparemenu(el, menu)
+{
+	if (el.attr('type') == 'ts')
+	{
+		if (el.attr('def') == 'HD')
+		{
+			$('#optmenu').enableContextMenuItems('#enc');
+			if (el.attr('encd') == 1)
+				$(menu).changeContextMenuItem('#enc',
+				    'Remove ENC');
+			else
+				$(menu).changeContextMenuItem('#enc',
+				    'Set ENC');
+		}
+		else
+			$('#optmenu').disableContextMenuItems('#enc');
+
+		$('#optmenu').enableContextMenuItems('#new');
+		if (el.attr('new') == 1)
+			$(menu).changeContextMenuItem('#new', 'Mark watched');
+		else
+			$(menu).changeContextMenuItem('#new', 'Mark new');
+
+
+		$('#optmenu').enableContextMenuItems('#lock');
+		if (el.attr('locked') == 1)
+		{
+			$(menu).changeContextMenuItem('#lock', 'Unlock');
+			$('#optmenu').disableContextMenuItems('#delete');
+		}
+		else
+		{
+			$(menu).changeContextMenuItem('#lock', 'Lock');
+			$('#optmenu').enableContextMenuItems('#delete');
+		}
+	}
+	else
+	{
+		$('#optmenu').enableContextMenuItems('#delete');
+		$('#optmenu').disableContextMenuItems('#lock');
+		$('#optmenu').disableContextMenuItems('#enc');
+		$('#optmenu').disableContextMenuItems('#new');
+	}
+
+}
+
+
+$(document).ready(function() {
+
+var menuclick = function(action, el, pos)
+{
+	var file = $(el).parent().prevAll('a.bf').last().attr('file');
+	var bfile = file.replace(/.*\/|\.[^.]*$/g, '');
+	bfile = bfile.replace(/[\x00-\x1f]+/g, '');
+	var type = $(el).attr('type');
+	var id = $(el).attr('did');
+	switch (action)
+	{
+	    case 'delete':
+		confirm_action('delete', delete_callback, file,
+		    type, id);
+		break;
+
+	    case 'lock':
+		confirm_action('change the lock on', lock_callback,
+		    file, type, id);
+		break;
+
+	    case 'enc':
+		confirm_action('change the ENC flag on', enc_callback,
+		    file, type, id);
+		break;
+
+	    case 'new':
+		confirm_action('change the New flag on', new_callback,
+		    file, type, id);
+		break;
+
+	    case 'rename':
+		$('#rename').val(bfile);
+		$('#renameorig').val(file);
+
+		$('#titleorig').val('');
+		$('#renametitle').val('');
+		$('#synopsis').val('');
+		$('tr.tstype').css('display', 'none');
+
+		if (type == 'ts')
+		{
+			$.getJSON('/cgi-bin/browse/epgtitle.jim?file=' +
+			    encodeURIComponent(file), epginfo_callback);
+		}
+
+		$('#renameform').dialog('open');
+		break;
+
+	    case 'download':
+		window.location.href = '/cgi-bin/browse/download.jim?file=' +
+		    encodeURIComponent(file);
+		break;
+
+	    default:
+		alert('Unhandled action: ' + action);
+		break;
+	}
+};
+
+	// Bind context menu to opt+ image
+	$('img.opt').contextMenu(
+		{
+			menu: 'optmenu',
+			leftButton: true,
+			beforeShow: preparemenu
+		},
+		menuclick
+	);
+
+	// Disable items which are not yet implemented.
+	$('#optmenu').disableContextMenuItems('#title');
+
+	// Create reusable dialogue.
+	var $dialog = $('#dialogue').dialog({
+		title: "Media Details",
+		modal: false, autoOpen: false,
+		height: 600, width: 700,
+		show: 'scale', hide: 'fade',
+		draggable: true, resizable: true,
+		buttons: {
+			"Close": function() {
+				$(this).dialog('close');
+			}
+		},
+		close: function(e,u) { $('#dialogue').empty().html(
+		    '<img src="/img/loading.gif" alt="loading">'); }
+	});
+
+	// Bind dialogue open to filenames.
+	$('a.bf').click(function(e) {
+		e.preventDefault();
+		var file = $(this).attr('file');
+		var type = $(this).attr('type');
+		var url = '/cgi-bin/browse/file.jim?file=' +
+		    encodeURIComponent(file) + '&type=' + type;
+		$('#dialogue').load(url);
+		$dialog.dialog('open');
+	});
+
+	$('#renameform').dialog({
+		autoOpen: false,
+		height: 'auto', width: 'auto',
+		modal: true,
+		buttons: {
+			"Update": rename_submit,
+			"Close": function() {
+				$(this).dialog('close');
+			}
+		},
+		close: function() { $('#rename').val(''); }
+	});
+
+	$('#savestreamform').dialog({
+		autoOpen: false,
+		height: 'auto', width: 'auto',
+		modal: true,
+		buttons: {
+			"Save": savestream_submit,
+			"Cancel": function() {
+				$(this).dialog('close');
+			}
+		},
+		close: function() { $('#savestream_name').val(''); }
+	});
+
+	// Create re-usable confirmation dialogue.
+	$confirm = $('#confirm').dialog({
+		modal: true, autoOpen: false,
+		height: 160, width: 500,
+		show: 'fade', hide: 'fade',
+		draggable: false, resizable: false
+	});
+	
+	var dir = $('#dir').text();
+
+	// Load folder sizes
+	$.getJSON('/cgi-bin/browse/sizes.jim?dir=' + encodeURIComponent(dir),
+		folder_size_callback);
+
+	// Flag folders with unwatched items
+	$.getJSON('/cgi-bin/browse/newdir.jim?dir=' + encodeURIComponent(dir),
+		new_folder_callback);
+
+	$('#dedup').button().click(function() {
+		window.location = '/cgi-bin/dedup.jim?dir='
+		    + encodeURIComponent(dir);
+	});
+
+	$('#save_stream').button().click(function() {
+		$('#savestream_spin').hide();
+		$('#savestreamform').dialog('open');
+		$('#savestream_detail').load(
+		    '/cgi-bin/browse/ffmpeg.jim?file=' +
+		    encodeURIComponent($('#save_stream').attr('file')));
+	});
+});
+

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

@@ -0,0 +1,27 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/ts.class
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+set file [dict get $_cgi file]
+set type [dict get $_cgi type]
+
+if {$type eq "ts"} {
+	set ts [ts fetch $file]
+	if {[$ts delete]} {
+		puts "Successfully deleted $file."
+	} else {
+		puts "Problem deleting $file, [$ts get error]"
+	}
+	exit
+}
+
+file delete $file
+puts "Successfully deleted $file."
+

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

@@ -0,0 +1,41 @@
+#!/mod/bin/jimsh
+
+package require cgi
+package require sqlite3
+source /mod/var/mongoose/lib/setup
+require ts.class
+
+#puts "Content-Type: text/plain\r\n\r\n"
+
+cgi_input
+#cgi_dump
+
+set file [cgi_get file "/media/My Video/Chuggington/Hodge_and_the_Chugnav.ts"]
+set rfile [file normalize $file]
+set ts [ts fetch $file]
+
+# Default to just downloading the raw file.
+set url $file
+set mime "video/ts"
+
+# Unless the DLNA option is available.
+set dlna [$ts dlnaloc]
+if {[llength $dlna]} { lassign $dlna url mime }
+
+puts "DLNA: $dlna"
+
+puts "Content-Type: text/plain"
+puts "Refresh: 0; url=$url"
+puts "Content-length: 0"
+puts ""
+
+#puts "Pragma: public"
+#puts "Expires: 0"
+#puts "Cache-Control: must-revalidate, post-check=0, pre-check=0"
+#puts "Content-Type: application/force-download"
+#puts "Content-Type: application/download"
+#puts "Content-Type: $mime"
+#puts "Content-Disposition: attachment; filename=\"[file tail $file]\""
+#puts "Content-Transfer-Encoding: binary"
+#puts "Content-Length: [file size $rfile]"
+

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

@@ -0,0 +1,27 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/ts.class
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+#set _cgi(file) "/media/My Video/The Walking Dead/The Walking Dead S01E06.ts"
+
+set file [dict get $_cgi file]
+set ts [ts fetch $file]
+if {[set ts [ts fetch $file]] != 0} {
+	set action enc
+	if {[$ts flag "Encrypted"]} { set action unenc }
+
+	if {[$ts $action]} {
+		puts "Successfully [set action]ed $file."
+	} else {
+		puts "Problem [set action]ing $file,
+		    [$ts get error]"
+	}
+}
+

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

@@ -0,0 +1,22 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/ts.class
+
+puts "Content-Type: application/json"
+puts ""
+
+cgi_input
+#cgi_dump
+#set _cgi(file) "/media/My Video/Doctor Who/6.13._The_Almost_People.ts"
+
+if {![dict exists $_cgi file]} { exit }
+
+set file [dict get $_cgi file]
+set ts [ts fetch $file]
+
+puts "{"
+puts "\"title\" : \"[$ts get title]\","
+puts "\"synopsis\" : \"[$ts get synopsis]\""
+puts "}"
+

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

@@ -0,0 +1,17 @@
+#!/mod/bin/jimsh
+
+package require cgi
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+if [file exists /mod/bin/ffmpeg] {
+	set file [dict get $_cgi file]
+	puts [exec /mod/var/mongoose/lib/ffmpeg -i $file]
+} else {
+	puts "Install ffmpeg package for more information..."
+}
+

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

@@ -0,0 +1,121 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/pretty_size
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+#set _cgi(file) "/media/My Video/Dangermouse/Series 1/01_rogue_robots.avi"
+
+if {![dict exists $_cgi file]} { exit }
+
+set file [dict get $_cgi file]
+set type [dict get $_cgi type]
+
+file stat $file st
+set sz [pretty_size $st(size)]
+
+if {$type eq "ts"} {
+	source /mod/var/mongoose/lib/epg.class
+	source /mod/var/mongoose/lib/ts.class
+
+	set ts [ts fetch $file]
+
+	puts "
+<table class=keyval>
+<tr>
+	<th>Title</th>
+	<td>[$ts get title]</td>
+</tr><tr>
+	<th>Synopsis</th>
+	<td>[$ts get synopsis]</td>
+</tr><tr>
+	"
+
+	if {[$ts flag "Guidance"] > 0} {
+		puts "
+			<th>Guidance</th>
+			<td><img class=va
+			    src=/images/174_1_26_GuidancePolicy.png height=21>
+			    [$ts get guidance]
+			</td>
+			</tr><tr>
+		"
+	}
+
+	puts "
+	<th>Definition</th>
+	<td>
+	"
+	if {[$ts get definition] eq "HD"} {
+		puts "<img class=va src=/images/172_1_00_HD.png height=21>"
+	} else {
+		puts "<img class=va src=/images/172_1_26_SD.png height=21>"
+	}
+	puts "</td>
+</tr><tr>
+	<th>Channel</th>
+	<td>[epg channelicon [$ts get channel_name] 50 "vertical-align: middle"]
+	    [$ts get channel_num] - [$ts get channel_name]</td>
+</tr><tr>
+	<th>Start Time</th>
+	<td>"
+	puts [clock format [$ts get start] -format "%c %Z"]
+	puts "</td>
+</tr><tr>
+	<th>End Time</th>
+	<td>"
+	puts [clock format [$ts get end] -format "%c %Z"]
+	puts "</td>
+</tr><tr>
+	<th>Duration</th>
+	<td>[$ts duration] minute(s).</td>
+</tr><tr>
+	<th>Size</th>
+	<td>$sz</td>
+"
+set dlna [$ts dlnaloc]
+if {[llength $dlna]} {
+	puts "</tr><tr><th>DLNA&nbsp;URL</th><td>[lindex $dlna 0]</td>"
+}
+puts "
+</tr><tr>
+	<th>Flags</th>
+	<td>[$ts get flags]</td>
+</tr>
+</table>
+	"
+	exit
+}
+
+# Otherwise, for a general file.
+
+puts "
+<table class=keyval>
+<tr>
+	<th>File</th>
+	<td>$file</td>
+</tr><tr>
+	<th>Size</th>
+	<td>$sz</td>
+</tr><tr>
+	<th>Info</th>
+	<td class=pre id=ffmpeg>
+		<img src=/img/loading.gif><i>Loading...</i>
+	</td>
+</tr>
+</table>
+"
+
+set url "/cgi-bin/browse/ffmpeg.jim?file=[cgi_quote_url $file]"
+puts { <script type="text/javascript"> }
+puts "var url = \"$url\";"
+puts {
+	$('#ffmpeg').load(url);
+</script>
+}
+

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

@@ -0,0 +1,27 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/ts.class
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+#set _cgi(file) "/media/My Video/The Walking Dead/The Walking Dead S01E06.ts"
+
+set file [dict get $_cgi file]
+set ts [ts fetch $file]
+if {[set ts [ts fetch $file]] != 0} {
+	set action lock
+	if {[$ts flag "Locked"]} { set action unlock }
+
+	if {[$ts $action]} {
+		puts "Successfully [set action]ed $file."
+	} else {
+		puts "Problem [set action]ing $file,
+		    [$ts get error]"
+	}
+}
+

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

@@ -0,0 +1,27 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/ts.class
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+#set _cgi(file) "/media/My Video/The Walking Dead/The Walking Dead S01E06.ts"
+
+set file [dict get $_cgi file]
+set ts [ts fetch $file]
+if {[set ts [ts fetch $file]] != 0} {
+	set action new
+	if {[$ts flag "New"]} { set action watched }
+
+	if {[$ts set_$action]} {
+		puts "Successfully marked $file as $action."
+	} else {
+		puts "Problem marking $file as $action,
+		    [$ts get error]"
+	}
+}
+

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

@@ -0,0 +1,34 @@
+#!/mod/bin/jimsh
+
+package require cgi
+package require pack
+
+puts "Content-Type: application/json"
+puts ""
+
+cgi_input
+#cgi_dump
+
+#set _cgi(dir) "/media/My Video"
+
+set root [dict get $_cgi dir]
+# Strip double slashes
+regsub -all -- {\/+} "$root/*" "/" root
+
+puts "{"
+foreach dir [glob -nocomplain "$root"] {
+	if {[file exists "$dir/.series"]} {
+		set fd [open "$dir/.series"]
+		set bytes [read $fd 8]
+		set recs [unpack $bytes -uintle 0 32]
+		set plays [unpack $bytes -uintle 32 32]
+		set diff $($recs - $plays)
+		if {$diff != 0} {
+			set node [lindex [split $dir /] end]
+			puts "\"$node\": $diff,"
+		}
+	}
+}
+puts "\"dummy\" : 0"
+puts "}"
+

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

@@ -0,0 +1,53 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/ts.class
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+#renameorig
+#titleorig
+#rename
+#renametitle
+
+#set _cgi(renameorig) "/media/My Video/The Walking Dead/The Walking Dead_20110521_2201.ts"
+#set _cgi(rename) "Last Episode"
+
+if {![dict exists $_cgi renameorig]} { exit }
+
+set file [dict get $_cgi renameorig]
+set newfile [dict get $_cgi rename]
+
+if {[string length [string trim $newfile]] == 0 || $file eq $newfile} {
+	set newfile ""
+}
+
+if {[file isdirectory $file]} {
+	#puts "Directory."
+	if {$newfile ne ""} {
+		set dir [file dirname $file]
+		set newfile "${dir}/${newfile}"
+		file rename $file $newfile
+	}
+} elseif {[set ts [ts fetch $file]] != 0} {
+	#puts "TS file."
+
+	catch {
+		set title [dict get $_cgi renametitle]
+		set titleorig [dict get $_cgi titleorig]
+
+		if {[string length [string trim $title]] > 0 &&
+		    $title ne $titleorig} {
+			$ts settitle $title
+		}
+	}
+	if {$newfile ne ""} { ts renamegroup $file $newfile }
+} else {
+	#puts "Normal file."
+	if {$newfile ne ""} { ts renamegroup $file $newfile }
+}
+

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

@@ -0,0 +1,21 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/ts.class
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+set dir [cgi_get dir "/media/My Video"]
+set file [file tail [cgi_get savestream_name]]
+set sfile [cgi_get savestream_source "/mnt/hd3/Streamer_down_file"]
+if {$file == "0"} { exit }
+if {[string length [string trim $file]] == 0} { exit }
+
+if {[file extension $file] ne ".mp4"} { append file ".mp4" }
+
+file copy $sfile "$dir/$file"
+

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

@@ -0,0 +1,46 @@
+#!/mod/bin/jimsh
+
+package require cgi
+
+#puts "Content-Type: text/plain"
+puts "Content-Type: application/json"
+puts ""
+
+cgi_input
+#cgi_dump
+
+#set _cgi(dir) "/media/My Video"
+
+set dir [dict get $_cgi dir]
+
+#9.4G	/media/My Video/Archive
+#1.4G	/media/My Video/CSI_ Crime Scene Investigation
+puts "{"
+foreach line [split [exec /mod/bin/busybox/du -h "$dir/"] "\n"] {
+	set fields [split $line "\t"]
+	set size [lindex $fields 0]
+	set node [file tail [lindex $fields 1]]
+#	set node [lindex [split [lindex $fields 1] /] end]
+	puts "\"$node\" : \"$size\","
+}
+
+# Handle symbolic links.
+foreach file [glob -nocomplain "$dir/*"] {
+	if {[catch {set lk [file readlink $file]}]} continue
+
+	if {![string match "/*" $lk]} { set lk "$dir/$lk" }
+
+	if {![file isdirectory $lk]} continue
+	foreach line [split [exec /mod/bin/busybox/du -h "$lk"] "\n"] {
+		set fields [split $line "\t"]
+		if {[lindex $fields 1] eq $lk} {
+			set node [file tail $file]
+			set size [lindex $fields 0]
+			puts "\"$node\" : \"@$size\","
+		}
+	}
+}
+
+puts "\"dummy\" : \"\""
+puts "}"
+

var/mongoose/cgi-bin/cfwreset

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+echo "Content-Type: text/plain"
+echo
+
+/bin/rm -rf /mod/*
+

var/mongoose/cgi-bin/channel.jim

@@ -0,0 +1,134 @@
+#!/mod/bin/jimsh
+
+package require cgi
+package require sqlite3
+source /mod/var/mongoose/lib/setup
+require altrow progressbar epg.class
+
+puts "Content-Type: text/html"
+puts ""
+
+header
+
+cgi_input
+
+proc f2c {frequency} {
+	set ch int($((($frequency / 1000) - 303.25) / 8))
+	return [expr int($ch)]
+}
+
+if {[catch {set db [sqlite3.open /var/lib/humaxtv/channel.db]} msg]} {
+	puts "Error opening channel database: $msg"
+	exit
+}
+
+puts "
+	<button id=expandall>Expand All</button>
+	<button id=collapseall>Collapse All</button>
+	<br><br>
+	<table class=borders>
+	<tr>
+		<th>Channel</th>
+		<th>Frequency</th>
+		<th>Signal Strength</th>
+		<th>Signal Quality</th>
+		<th>Mux</th>
+		<th>Channels</th>
+		<th>&gt;799</th>
+	</tr>
+"
+foreach tw [$db query {
+		select tsIdx, usTsID, ulFrequency, ucLevel, ucQuality
+		from TBL_TS
+		order by ulFrequency
+	}] {
+	lassign $tw x tsIdx x usTsID x ulFrequency x ucLevel x ucQuality
+
+	altrow
+	puts "
+		<td>[f2c $ulFrequency]</td>
+		<td>[expr $ulFrequency / 1000.0] MHz</td>
+	"
+	puts "<td>[progressbar $ucLevel]</td>"
+	puts "<td>[progressbar $ucQuality]</td>"
+
+	set channels [$db query {
+		select usLcn, szSvcName, szPrvName, aucDefaultAuthority
+		from TBL_SVC left join TBL_PRV using (prvIdx)
+		where tsIdx = %s
+		order by usLcn
+		} $tsIdx]
+
+	set mux "???"
+	set ehs 0
+	foreach chan $channels {
+		lassign $chan x lcn x name
+		set name [string range $name 1 end]
+		if {$lcn >= 800} { incr ehs }
+		switch $name {
+			"BBC ONE" { set mux "PSB1/BBC A" }
+			"ITV1" { set mux "PSB2/D3&amp;4" }
+			"BBC One HD" { set mux "PSB3/BBC B (HD)" }
+			"ITV3" { set mux "COM4/SDN" }
+			"Dave" { set mux "COM5/ARQ A" }
+			"Film4" { set mux "COM6/ARQ B" }
+		}
+	}
+	puts "<td>$mux</td>"
+
+	puts "<td>[llength $channels]
+		<a class=mchan ts=$tsIdx href=#>
+			<img border=0 height=14
+			    src=/images/421_1_00_CH_Title_2R_Arrow.png>
+			    view
+		</a></td>"
+	puts "<td>$ehs</th>"
+	puts "</tr>"
+	puts "<tr id=mchan_$tsIdx class=mchan style=\"display: none\">
+		<td colspan=5>"
+	puts "<table style=\"margin-left: 5em\">"
+	puts "<tr>
+		<th colspan=3>Channel</th>
+		<th>Provider</th>
+		<th>Authority</th>
+	      </tr>"
+	foreach chan $channels {
+		lassign $chan x lcn x name x prv x auth
+		set name [string range $name 1 end]
+		set prv [string range $prv 3 end]
+		altrow
+		puts "<td class=va>"
+		puts "[epg channelicon $name 50]</td>
+		    <td>$lcn</td><td>$name</td>"
+		puts "</td><td>"
+		puts $prv
+		puts "</td><td>"
+		puts $auth
+		puts "</td>"
+		puts "</tr>"
+	}
+	puts "</table>"
+	puts "</td></tr>"
+}
+
+puts "</table>"
+
+puts {
+<script type=text/javascript>
+
+$(document).ready(function() {
+	$('a.mchan').click(function(e) {
+		e.preventDefault();
+		$('#mchan_' + $(this).attr('ts')).slideToggle('slow');
+	});
+	$('#expandall').button().click(function() {
+		$('tr.mchan').slideDown('slow');
+	});
+	$('#collapseall').button().click(function() {
+		$('tr.mchan').slideUp('slow');
+	});
+});
+
+</script>
+}
+

var/mongoose/cgi-bin/db.jim

@@ -0,0 +1,85 @@
+#!/mod/bin/jimsh
+
+package require cgi
+package require sqlite3
+source /mod/var/mongoose/lib/setup
+require altrow
+
+puts "Content-Type: text/html"
+puts ""
+
+set databases {
+	/var/lib/humaxtv/rsvp.db
+	/var/lib/humaxtv/rsv.db
+	/var/lib/humaxtv/setup.db
+	/var/lib/humaxtv/channel.db
+	/mnt/hd2/dms_cds.db
+}
+
+header
+
+cgi_input
+#cgi_dump
+
+set ftab [cgi_get tab]
+set fdb [cgi_get db]
+
+if {$fdb != 0} {
+	puts "<h1><a href=/cgi-bin/db.jim>Remove filters</a></h1>"
+}
+
+proc db_info {db_file} {
+	global _cgi fdb ftab
+
+	if {$fdb != 0 && [file tail $db_file] ne $fdb} { return }
+	if {![file exists $db_file]} { return }
+
+	set db [sqlite3.open $db_file]
+	set tables [$db query {
+		select name from sqlite_master
+		where type='table' order by name
+	}]
+
+	puts "<h1><a href=/cgi-bin/db.jim?db=[file tail $db_file]>
+		$db_file</a></h1>"
+	
+	foreach table $tables {
+		set table [lindex $table 1]
+		if {$ftab != 0 && $ftab ne $table} { continue }
+		set columns [$db query "pragma table_info($table)"]
+		set datas [$db query "SELECT * FROM $table order by 1"]
+		
+		puts "<h2><a href=/cgi-bin/db.jim?db=[file tail $db_file]&tab=$table>$table</a></h2>"
+		puts "<table class=borders>"
+		puts "  <tr>"
+		foreach column $columns {
+			puts "    <th>[lindex $column 3]</th>"
+		}
+		puts "  </tr>"
+		foreach data $datas {
+			altrow
+			
+			for {set i 1} {$i < [llength $data]} {incr i 2} {
+				puts "    <td>[lindex $data $i]</td>"
+			}
+			puts "  </tr>"
+		}
+		puts "</table>"
+	}
+	
+	$db close
+}
+
+if {$fdb == 0} {
+	puts "Please choose database to view:<ul>"
+	foreach db $databases {
+		puts "<li><a href=$::env(REQUEST_URI)?db=[file tail $db]>
+		    $db</a></li>"
+	}
+	puts "</ul>"
+} else {
+	foreach db $databases { db_info $db }
+}
+
+footer
+

var/mongoose/cgi-bin/dedup.jim

@@ -0,0 +1,122 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class pretty_size altrow
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+set dir [cgi_get dir "/media/My Video"]
+set doit [cgi_get doit 0]
+
+# Strip double slashes
+
+header
+
+puts "<fieldset style=\"display: inline\">
+<legend>De-duplicate <span id=dir>$dir</span></legend>
+<table class=borders>
+<tr>
+	<th>File</th>
+	<th>Proposed Filename</th>
+	<th>Proposed Title</th>
+	<th>Status</th>
+</tr>
+"
+
+regsub -all -- {\/+} "$dir/*" "/" sdir
+
+set seen {}
+
+foreach file [lsort [glob -nocomplain "$sdir"]] {
+	if {[file extension $file] ne ".hmt"} { continue }
+	altrow
+	set ts [ts fetch $file 1]
+	set base [file tail [file rootname $file]]
+	puts "<td nowrap>$base</td>"
+	set syn [$ts get synopsis]
+	regsub -nocase -all -- {^new series\.* *} $syn "" syn
+	regsub -all -- { *[:].*$} $syn "" syn
+	if {[string length $syn] > 40} {
+		lassign [split $syn "."] v w
+		set syn $v
+		if {[string length $syn] < 6 && [string length $w] < 6} {
+			append syn "_$w"
+		}
+	}
+	if {[string length $syn] < 10} {
+		if {[string match "${syn}*" [$ts get title]]} {
+			set syn [$ts get title]
+		} else {
+			append syn " [$ts get title]"
+		}
+	}
+	regsub -all -- {[\/ &]} $syn "_" fn
+	puts "<td>$fn</td>"
+	puts "<td>$syn</td>"
+	puts "<td>"
+	if {$fn in $seen} {
+		puts -nonewline "Duplicate"
+		if {$doit} {
+			set dupdir "$dir/_duplicates"
+			if {![file exists $dupdir]} { file mkdir $dupdir }
+			while {[file exists $dupdir/$fn.hmt]} {
+				append fn "~"
+			}
+			ts renamegroup $file "_duplicates/$fn"
+			puts -nonewline " - Renamed to _duplicates/$fn"
+		}
+	} elseif {[string length $syn] > 40} {
+		puts -nonewline "Cannot process"
+	} elseif {$base eq $fn} {
+		puts -nonewline "Nothing to do"
+	} elseif {$doit} {
+		# Dooooo, it.
+		$ts settitle $syn
+		ts renamegroup $file $fn
+		puts -nonewline "Done"
+	}
+	lappend seen $fn
+	
+	puts "</td>"
+	puts "</tr>"
+}
+
+puts {
+</table>
+</fieldset>
+<div style="padding-top: 2em">
+<small>
+<button id=browse>Back to media browser</button>
+}
+
+if {!$doit} { puts "<button id=dedup>Process folder</button>" }
+
+puts {
+</small>
+
+</div>
+
+<script type=text/javascript>
+$('#browse').button().click(function() {
+	window.location = '/cgi-bin/browse.jim?dir=' +
+	    encodeURIComponent($('#dir').text());
+});
+}
+
+if {!$doit} {
+	puts {
+	$('#dedup').button().click(function() {
+		window.location = window.location + '&doit=1';
+	});
+	}
+}
+
+puts "</script>"
+
+footer
+

var/mongoose/cgi-bin/epg_dump.jim

@@ -1,12 +1,13 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/epg.class
+source /mod/var/mongoose/lib/setup
+require epg.class
 
 puts "Content-Type: text/html"
 puts ""
 
-source /mod/var/mongoose/html/lib/header.jim
+header
 
 cgi_input
 #cgi_dump
@@ -31,5 +32,6 @@ if { $raw == 0 } {
 puts "</pre>"
 
 epg cleanup
-source /mod/var/mongoose/html/lib/footer.jim
+
+footer
 

var/mongoose/cgi-bin/epg_info.jim

@@ -1,7 +1,8 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/epg.class
+source /mod/var/mongoose/lib/setup
+require epg.class
 
 puts "Content-Type: text/html"
 puts ""
@@ -9,19 +10,25 @@ puts ""
 cgi_input
 #cgi_dump
 
-set service 0
-catch { set service [dict get $_cgi service] }
-set event 0
-catch { set event [dict get $_cgi event] }
-if {! [dict exists $_cgi bare]} {
-	source /mod/var/mongoose/html/lib/header.jim
-}
-
-#set service 8384
-#set event 25293
+set service [cgi_get service 0]
+set event [cgi_get event 0]
+if {! [dict exists $_cgi bare]} { header }
 
 set record [lindex [epg fetch dump -service $service -event $event] 0]
 $record get_channel_info
+set others [$record othertimes]
+
+puts {
+	<style type=text/css>
+	font.also
+	{
+		font-size: 0.9em;
+		font-style: italic;
+		color: #333;
+		background: transparent;
+	}
+	</style>
+}
 
 puts "
 	<table class=keyval>
@@ -33,10 +40,38 @@ puts "
 		<td>[$record get text]</td>
 	</tr><tr>
 		<th>Start</th>
-		<td>[clock format [$record get start] -format {%c %Z}]</td>
+		<td>[clock format [$record get start] -format {%c %Z}]
+"
+
+foreach o $others {
+	if {[$o ended]} { continue }
+	$o get_channel_info
+	$o process_sched
+	if {[$o get series_crid] eq ""} { set ro 1 } else { set ro 2 }
+	puts -nonewline "<br><font class=also>&nbsp;&nbsp;&nbsp;&nbsp;"
+	puts -nonewline "Also: "
+	puts -nonewline "<a class=event href=# xs=[$o get service_id] "
+	puts -nonewline "xe=[$o get event_id] "
+	puts -nonewline "sch=[$o get sched_type] rec=$ro>"
+	puts -nonewline "[clock format [$o get start] -format {%c %Z}]"
+	puts -nonewline " on "
+	puts -nonewline [$o channel_icon 16]
+	puts -nonewline "[$o get channel_name] "
+	puts "</a>"
+	puts "</font>"
+}
+
+puts "
+		</td>
 	</tr><tr>
 		<th>Duration</th>
-		<td>[clock format [$record get duration] -format %T]</td>
+		<td>[clock format [$record get duration] -format %T]
+"
+if {[$record showing]} {
+	puts [progressbar [$record percent]]
+}
+puts "
+	</td>
 	</tr><tr>
 		<th>Type</th>
 		<td>[$record get content_type] ([$record get content_code])</td>
@@ -55,8 +90,13 @@ if {[$record get warning] != ""} {
 if {[$record get event_crid] != ""} {
 	puts "
 	<tr>
-		<th>CRID</th>
-		<td>[$record get channel_crid][$record get event_crid]</td>
+		<th>CRID</th><td>
+		<a href=/cgi-bin/epg_search.jim?crid=[$record get event_crid]>
+			<img border=0 height=14
+			    src=/images/421_1_00_CH_Title_2R_Arrow.png>
+			[$record get channel_crid][$record get event_crid]
+			</a>
+		</td>
 	</tr>
 	"
 }
@@ -104,8 +144,8 @@ puts "
 	</a>
 "
 
-epg cleanup
-if {! [dict exists $_cgi bare]} {
-	source /mod/var/mongoose/html/lib/footer.jim
-}
+puts "<div id=epginfo_extra class=footnote></div>"
+
+epg cleanup
+if {! [dict exists $_cgi bare]} { footer }
 

var/mongoose/cgi-bin/epg_schedule.jim

@@ -0,0 +1,43 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require epg.class system.class
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+if {![dict exists $_cgi service] || ![dict exists $_cgi event]} {
+	puts "Error, insufficient parameters passed."
+	exit
+}
+
+set service $_cgi(service)
+set event $_cgi(event)
+set type 1
+if {[dict exists $_cgi type]} { set type $_cgi(type) }
+
+set event [lindex [epg fetch dump -service $service -event $event] 0]
+if {$event eq ""} {
+	puts "Error, cannot find event to schedule."
+	exit
+}
+if {[$event percent] > 0} {
+	puts "Error, cannot record programme which has already started showing"
+	puts "or occurred in the past."
+	exit
+}
+
+set r [rsv construct $event $type]
+if {[catch {$r insert} msg]} {
+	puts "Error encountered while scheduling: <i>$msg</i>"
+} else {
+	puts "Successfully scheduled <i>[$event get name]</i>"
+	system restartpending
+}
+
+epg cleanup
+

var/mongoose/cgi-bin/epg_search.jim

@@ -1,28 +1,21 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/epg.class
-source /mod/var/mongoose/lib/altrow
-source /mod/var/mongoose/lib/cat
+source /mod/var/mongoose/lib/setup
+require epg.class spinner.class altrow
 
 puts "Content-Type: text/html"
 puts ""
 
-source /mod/var/mongoose/html/lib/header.jim
+header
 
-puts "<script type=text/javascript src=/js/highlight.js></script>"
+require totop
 
-source /mod/var/mongoose/lib/epg_popup
+puts "<script type=text/javascript src=/js/jquery.highlight.js></script>"
 
 cgi_input
 #cgi_dump
-#set _cgi [dict create term "doctor who"]
-#set env(REQUEST_URI) "test"
 
-set term ""
-catch { set term [dict get $_cgi term] }
-set cmd "search"
-if {[dict exists $_cgi full]} { set cmd "searchall" }
 set ct 0
 catch { set ct [dict get $_cgi ct] }
 set crid ""
@@ -30,72 +23,35 @@ catch { set crid [dict get $_cgi crid] }
 set scrid ""
 catch { set scrid [dict get $_cgi scrid] }
 
-puts "
-<form method=get action=/cgi-bin/epg_search.jim>
-Search EPG: <input name=term size=20 maxlength=255 value=\"$term\">
-<input type=checkbox name=full"
-if {[dict exists $_cgi full]} { puts " checked" }
-puts ">Search descriptions as well as titles.
-<input type=submit value=Search>
-"
+if {[dict exists $_cgi term]} {
+	set lterm [dict get $_cgi term]
 
-set db [sqlite3.open /var/lib/humaxtv/setup.db]
-set res [$db query {
-	select itemBlob from TBL_USERCONFIG
-	where itemName like 'EPG\_KEYWORD\_%%' ESCAPE '\'
-}]
-
-proc cts {type img text} {
-	puts "<a href=$::env(REQUEST_URI)?ct=$type>
-		<img height=18 border=0 src=/images/173_3_00_G3_$img.png>&nbsp;$text</a>";
-}
-
-puts {
-	<br>
-	<table>
-	<tr><td rowspan=2>Content Type Searches</td>
-	<td>
-}
-
-cts 1 "Movie" "Film/Drama"
-puts "</td><td>"
-cts 2 "News" "News/Current affairs"
-puts "</td><td>"
-cts 4 "Sports" "Sport"
-puts "</td><td>"
-cts 9 "Education" "Education/Science/Factual"
-puts "</td><td>"
-cts 10 "Leisure" "Leisure"
-
-puts "</td></tr><tr><td>"
-
-cts 7 "Art" "Arts/Culture"
-puts "</td><td>"
-cts 3 "Show" "Show/Game show"
-puts "</td><td>"
-cts 5 "Children" "Children"
-puts "</td><td>"
-cts 8 "Society" "Social/Political/Economic"
-puts "</td><td>"
-cts 6 "Music" "Music/Ballet/Dance"
-
-puts "</tr></table>"
-
-puts "<table cellpadding=5>"
-if {[llength $res] > 0} {
-	puts "<tr><td>Keyword Searches</td>"
-	foreach keyword $res {
-		set kw [string range [lindex $keyword 1] 1 end]
-		puts "<td><a href=$env(REQUEST_URI)?term=[cgi_quote_url $kw]>$kw
-		    </a></td>"
+	if {[string match {CRID:*} $lterm]} {
+		set crid [string range $lterm 5 end]
+	} elseif {[string match {SCRID:*} $lterm]} {
+		set scrid [string range $lterm 6 end]
 	}
-	puts "</tr>"
+} elseif {$crid ne ""} {
+	set _cgi(term) "CRID:$crid"
+} elseif {$scrid ne ""} {
+	set _cgi(term) "SCRID:$scrid"
 }
-puts "</table>"
 
-$db close
+require epg_search
 
-puts "</form>"
+[spinner new {
+	text "Searching EPG..."
+	size "1.2em"
+	style "margin: 1em;"
+	}] start
+
+require epg_popup
+
+#set _cgi [dict create term "doctor who"]
+#set env(REQUEST_URI) "test"
+
+set cmd "search"
+if {$searchfull} { set cmd "searchall" }
 
 if {$ct > 0 } {
 	set records [epg fetch dump -type $ct]
@@ -103,13 +59,16 @@ if {$ct > 0 } {
 	set records [epg fetch dump -crid $crid]
 } elseif {$scrid ne ""} {
 	set records [epg fetch dump -scrid $scrid]
-} elseif {$term ne ""} { 
-	set records [epg fetch $cmd -extra $term]
+} elseif {$searchterm ne ""} { 
+	set records [epg fetch $cmd -extra $searchterm]
+} else {
+	set records {}
 }
 
 set favlist [epg favlist]
 
-puts {
+if {[llength $records] > 0} {
+	puts {
 	<table class=borders id=results style="clear: both;margin: 0.5em 0 0 0">
 	<tr>
 		<th>Date</th>
@@ -117,6 +76,9 @@ puts {
 		<th>Programme</th>
 		<th>Synopsis</th>
 	</tr>
+	}
+} else {
+	puts "No results found."
 }
 
 proc rsort {v1 v2} {
@@ -135,9 +97,14 @@ foreach record [lsort -command rsort $records] {
 	}
 	altrow
 	$record get_channel_info
-	puts "<td nowrap>
+
+	set ended [$record ended]
+
+	if $ended { puts "<td nowrap class=blood>" } else { puts "<td nowrap>"}
+	puts "
 	    [clock format [$record get start] -format "%a %d %b %Y"]<br>
-		[clock format [$record get start] -format "%H:%M %Z"]</td>"
+		[clock format [$record get start] -format "%H:%M %Z"]"
+	puts "</td>"
 	puts "<td>[$record get channel_num]</td>"
 	puts "<td>[$record channel_icon 50]</td>"
 	puts "<td nowrap>
@@ -147,18 +114,17 @@ foreach record [lsort -command rsort $records] {
 	puts [$record cell]
 	puts "<td>[$record get text]</td><td>[$record get warning]</td>"
 	puts "</tr>"
-	flush stdout
 }
 puts "</table>"
 
-if {$term != ""} {
+if {$searchterm != ""} {
 	puts "
 		<script type=text/javascript>
-		highlight(document.getElementById(\"results\"), \"$term\");
+		\$('#results').highlight('$searchterm');
 		</script>
 	"
 }
 
 epg cleanup
-source /mod/var/mongoose/html/lib/footer.jim
+footer
 

var/mongoose/cgi-bin/epg_service.jim

@@ -1,15 +1,15 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/epg.class
-source /mod/var/mongoose/lib/spinner.class
-source /mod/var/mongoose/lib/altrow
-source /mod/var/mongoose/lib/cat
+source /mod/var/mongoose/lib/setup
+require epg.class spinner.class altrow
 
 puts "Content-Type: text/html"
 puts ""
 
-source /mod/var/mongoose/html/lib/header.jim
+header
+
+require totop
 
 [spinner new {
 	text "Loading EPG Data..."
@@ -20,12 +20,9 @@ source /mod/var/mongoose/html/lib/header.jim
 cgi_input
 #cgi_dump
 
-source /mod/var/mongoose/lib/epg_popup
-
-set service 0
-set service 4351
-catch { set service [dict get $_cgi service] }
+require epg_popup
 
+set service [cgi_get service 4351]
 set records [epg fetch dump -service $service]
 
 set tr [lindex $records 0]
@@ -56,21 +53,22 @@ puts {
 set i 0
 foreach record $records {
 	altrow
+	$record get_channel_info
+	set ended [$record ended]
 	if {[$record showing]} {
 	    puts "<td><img src=/images/111_1_00_Cursor_2R_Arrow.png></td>"
 	} else { puts "<td></td>" }
-	puts "<td nowrap>
-		[clock format [$record get start] -format "%a %d %b %Y"]</td>"
-	puts "<td nowrap>
-		[clock format [$record get start] -format "%H:%M"]</td>"
+	if $ended { puts "<td nowrap class=blood>" } else { puts "<td nowrap>" }
+	puts "[clock format [$record get start] -format "%a %d %b %Y"]</td>"
+	if $ended { puts "<td nowrap class=blood>" } else { puts "<td nowrap>" }
+	puts "[clock format [$record get start] -format "%H:%M"]</td>"
 	puts [$record cell]
 	puts "<td>[$record get text]</td>"
 	puts "<td>[$record get warning]</td>"
 	puts "</tr>"
-	flush stdout
 }
 puts "</table>"
 
 epg cleanup
-source /mod/var/mongoose/html/lib/footer.jim
+footer
 

var/mongoose/cgi-bin/opkg.jim

@@ -0,0 +1,36 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require pkg.class chunked
+
+cgi_input
+#cgi_dump
+
+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
+
+if {$cmd eq "upgrade"} { opkg update }
+opkg $cmd
+
+if {$cmd eq "update" || $cmd eq "upgrade"} {
+	chunk "Updating package meta information\r\n"
+	pkg fetchmeta
+	chunk "Done.\r\n"
+}
+
+end_chunked
+

var/mongoose/cgi-bin/pkg.jim

@@ -0,0 +1,98 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require settings.class pkg.class altrow
+
+if {[[settings] pkgdev]} { set filter 0 } else { set filter 1 }
+
+puts "Content-Type: text/html"
+puts "Pragma: no-cache"
+puts "Expires: Thu, 01 Jan 1970 00:00:00 GMT"
+puts ""
+
+cgi_input
+#cgi_dump
+if {![dict exists $_cgi type]} { set _cgi(type) avail }
+
+proc pkgrow {pkg} {
+	set name [$pkg get name]
+	altrow
+	puts "
+		<td nowrap>$name</td>
+	"
+
+	if {$::type eq "avail"} {
+		puts "<td nowrap>[$pkg get latest]</td>"
+	} else {
+		puts "<td nowrap>[$pkg get installed]</td>"
+	}
+
+	if {$::type eq "upgr"} {
+		puts "<td nowrap>[$pkg get latest]</td>"
+	}
+
+	if {[dict exists $::pkgmeta $name]} {
+		puts "<td>$::pkgmeta($name)</td>"
+	} else {
+		puts "<td>[$pkg get descr]</td>"
+	}
+
+	if {![$pkg is installed]} {
+		set type Install
+	} elseif {$::type eq "upgr" && [$pkg is upgradable]} {
+		set type Upgrade
+	} else {
+		set type Remove
+	}
+
+	puts "<td align=center><small><button id=\"[$pkg get name]\"
+	    action=[string tolower $type]
+	    class=\"va [string tolower $type]\">$type</button></small></td>"
+
+	puts "</tr>"
+}
+
+pkg loadmeta
+
+set type $_cgi(type)
+
+set pkgs [pkg $type]
+
+if {[llength $pkgs] > 0} {
+	puts "<table><tr><th>Package</th>"
+
+	if {$type eq "avail"} {
+		puts "<th>Available</th>"
+	} else {
+		puts "<th>Installed</th>"
+	}
+
+	if {$type eq "upgr"} {
+		puts "<th>Avail</th>"
+	}
+
+	puts "
+		<th>Description</th>
+		<th>&nbsp;&nbsp;Action&nbsp;&nbsp;</th>
+		</tr>
+	"
+
+	foreach pkg $pkgs {
+		if {$filter && ![dict exists $::pkgmeta $pkg]} { continue }
+		pkgrow [pkg load $pkg]
+	}
+	puts "</table>"
+	if {$filter} {
+		puts "<font class=footnote>This is a filtered package list. To show all packages, enable the <i>Show development and advanced packages</i> in the settings screen.</font>"
+	}
+} else {
+	puts "<i>No packages "
+	switch $type {
+		inst { puts "are installed." }
+		upgr { puts "are available for upgrade." }
+		avail { puts "are available for installation." }
+	}
+	puts "</i>"
+}
+

var/mongoose/cgi-bin/restart.jim

@@ -0,0 +1,56 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require rsv.class system.class
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+if {[cgi_get now] eq "yes"} {
+	# - Busybox reboot does sync the disk but may still not be clean enough.
+	puts "Restarting."
+	system reboot
+	exit
+}
+
+file delete /tmp/.restartpending
+header
+
+# Commit pending reservations on older mod versions.
+if {![file exists /sbin/rsvsync] && ![file exists /mod/boot/rsvsync]} {
+	rsv commit
+}
+
+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>
+	var handle = 0;
+	var pct = 0;
+	function update()
+	{
+		$('#progressbar').reportprogress(++pct);
+		if (pct == 100)
+		{
+			clearInterval(handle);
+			pct = 0;
+			window.location = '/';
+		}
+	}
+
+	$(document).ready(function() {
+		$('#progressbar').reportprogress(0);
+		handle = setInterval("update()", 300);
+		$.get('/cgi-bin/restart.jim?now=yes');
+	});
+</script>
+
+Please wait while the Humax restarts...<br>
+<div id=progressbar></div>
+}
+
+footer
+

var/mongoose/cgi-bin/restartblock.jim

@@ -0,0 +1,7 @@
+#!/mod/bin/jimsh
+
+puts "Content-Type: text/html"
+puts ""
+
+source /mod/var/mongoose/include/restart.jim
+

var/mongoose/cgi-bin/sched_cancel.jim

@@ -0,0 +1,28 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require rsv.class system.class
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+set slot [cgi_get slot 0]
+set table [cgi_get table TBL_RESERVATION] 
+
+set event [rsv slot $table $slot]
+
+if {$table eq "pending"} {
+	$event remove_pending
+	exit
+}
+
+$event clear_ulslot
+$event set_delete
+$event insert
+
+system restartpending
+

var/mongoose/cgi-bin/sched_info.jim

@@ -0,0 +1,123 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require rsv.class progressbar
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+set table [cgi_get table TBL_RESERVATION]
+set slot [cgi_get slot 0]
+
+set event [rsv slot $table $slot]
+
+set rsvicon [$event icon]
+if {$rsvicon ne ""} {
+	set rsvicon "<img src='images/$rsvicon' height=20>
+}
+
+set RKIcon [$event RKIcon]
+if {$RKIcon ne ""} {
+	set RKIcon "<img src='images/$RKIcon' height=20>
+}
+
+if {[$event get ucRecKind] == 4} {
+	set series 1
+} else {
+	set series 0
+}
+
+puts "
+	<table class=keyval>
+	<tr>
+		<th>Event [$event get ulslot]</th>
+		<td class=va>$rsvicon $RKIcon</td>
+	</tr><tr>
+		<th>Channel</th>
+		<td class=va>
+"
+if {[$event get usLcn] ne ""} {
+	puts "
+		<img class=va width=50
+		    src=\"/img/channels/[$event channel_name].png\">
+		- [$event get usLcn] - [$event channel_name]
+	"
+}
+
+puts "
+		</td>
+	</tr><tr>
+		<th>Event Name</th>
+		<td>[$event name]</td>
+	</tr><tr>
+		<th>Start</th>
+"
+
+set s [$event get nsttime]
+set d [$event get nduration]
+set e $($s + $d)
+set n [clock seconds]
+
+if { $n > $e } {
+	puts "<td class=blood nowrap class=va>"
+} else {
+	puts "<td nowrap class=va>"
+}
+puts "[clock format $s -format "%a %d %b %Y"]
+    [clock format $s -format "%H:%M %Z"]"
+
+if {$d > 0 && $n > $s && $n < $e} {
+	puts "<br>"
+	set perc [expr [expr $n - $s] * 100 / $d]
+	puts "<img class=va src=/images/745_1_11_Video_1REC.png>"
+	puts [progressbar $perc]
+}
+
+puts "
+		</td>
+	</tr><tr>
+		<th>Duration</th>
+		<td>[clock format [$event get nduration] -format %T]</td>
+	</tr>
+"
+
+set crid [join [lrange [split [$event get szCRID] /] 1 end]]
+if {$crid != ""} {
+	puts "<tr><th>"
+	if $series { puts "Series" } else { puts "Event" }
+	puts " CRID</th><td>"
+	puts -nonewline "<a href=/cgi-bin/epg_search.jim?"
+	if $series { puts -nonewline "s" }
+	puts "crid=/$crid>
+	<img border=0 src=/images/421_1_00_CH_Title_2R_Arrow.png
+	    height=14>
+	[$event get szCRID]"
+	puts "</a></td></tr>"
+}
+puts "<tr><th>Events</th><td>"
+set flag 0
+foreach ev [split [$event get szEventToRecord] "|"] {
+	if {$ev eq ""} { continue }
+	set ev [string range $ev 1 end]
+	if {$flag} { puts "<br>" }
+	incr flag
+	set crid [join [lrange [split $ev /] 1 end]]
+	puts -nonewline "<a href=/cgi-bin/epg_search.jim?"
+	puts "crid=/$crid>
+	<img border=0 src=/images/421_1_00_CH_Title_2R_Arrow.png
+	    height=14> 
+	$ev"
+	puts "</a>"
+}
+puts "</td></tr>"
+puts "<tr><th>Accepted</th><td>"
+if {[$event get aulEventToRecordInfo] != ""} {
+	puts "Yes"
+}
+puts "</td></tr>"
+puts "</table>"
+

var/mongoose/cgi-bin/settings.jim

@@ -1,7 +1,9 @@
 #!/mod/bin/jimsh
 
-source /mod/var/mongoose/lib/settings.class
 package require cgi
+source /mod/var/mongoose/lib/setup
+require settings.class
+require plugin
 
 puts "Content-Type: text/html"
 puts ""
@@ -14,11 +16,12 @@ set settings [settings new]
 set hostname [$settings hostname]
 set smtp_server [$settings smtp_server]
 set channel_group [$settings channel_group]
+set epg_style [$settings epg_style]
+set pkgdev [$settings pkgdev]
 
 # Handle updates
 
-#set _cgi(smtp_server) "fred.bob"
-#set env(REQUEST_URI) ''
+if {![dict exists $env REQUEST_URI]} { set env(REQUEST_URI) "" }
 
 proc _handle_update {class var old text} {
 	global _cgi
@@ -49,16 +52,27 @@ proc handle_str_update {var old {text "Value"}} {
 handle_str_update hostname $hostname Hostname
 _handle_update ascii smtp_server $smtp_server "SMTP Server"
 handle_int_update channel_group $channel_group "Channel Group"
+handle_str_update epg_style $epg_style "EPG Type"
+if {[dict exists $_cgi pkgdevoff] && ![dict exists $_cgi pkgdev]} {
+	set _cgi(pkgdev) 0
+}
+handle_int_update pkgdev $pkgdev "Development Package Display"
 
-source /mod/var/mongoose/html/lib/header.jim
-puts {<script type="text/javascript" src="/js/jquery.form.js"></script>}
+header
+
+puts {
+<script type="text/javascript" src="/js/jquery.form.js"></script>
+<script type="text/javascript" src="/js/jconfirmaction.jquery.js"></script>
+<link href=/css/jconfirmaction.jquery.css rel=stylesheet type=text/css />
+<script type="text/javascript" src="/js/iphone-style-checkboxes.js"></script>
+<link href=/css/iphone-style-checkboxes.css rel=stylesheet type=text/css />
+}
 
 puts {
 	<script type=text/javascript>
 	$(document).ready(function () {
-		//$(":submit").button();
-		//$(":submit").height(20);
-		$('form').each(function(i, el) {
+		$(":submit").button();
+		$('form.auto').each(function(i, el) {
 			var id = $(this).attr('id');
 			var output = '#' + id + '_output'
 			$(this).ajaxForm({
@@ -75,14 +89,23 @@ puts {
 }
 
 puts "
-	<h1>Settings</h1>
-	<table class=keyval>
+	<fieldset style=\"display: inline\">
+		<legend>
+			General Settings
+		</legend>
+	<table>
+"
+
+puts "
 	<tr>
-	<form id=hostname method=get action=$env(REQUEST_URI)>
-		<th>Hostname</th>
+	<form class=auto id=hostname method=get action=$env(REQUEST_URI)>
+		<th class=key>Hostname</th>
 		<td><input name=hostname value=\"$hostname\"
+		    class=\"text ui-widget-content ui-corner-all\"
 		    length=20 maxlength=50>
+		    <small>
 		    <input id=hostname_submit value=\"change\" type=submit>
+		    </small>
 		    <div id=hostname_output></div>
 		</td>
 	</form>
@@ -91,12 +114,23 @@ puts "
 
 puts "
 	<tr>
-	<form id=smtp_server method=get action=$env(REQUEST_URI)>
-		<th>SMTP Server for outbound email</th>
-		<td><input name=smtp_server value=\"$smtp_server\"
-		    length=20 maxlength=50>
-		    <input id=smtp_server_submit value=\"change\" type=submit>
-		    <div id=smtp_server_output></div>
+	<form class=auto id=epg_style method=get action=$env(REQUEST_URI)>
+		<th class=key>Default Now/Next style</th>
+		<td><select id=epg_style name=epg_style
+		    class=\"text ui-widget-content ui-corner-all\">
+"
+puts "<option value=standard"
+if {$epg_style ne "grid"} { puts " selected" }
+puts ">Standard\n"
+puts "<option value=grid"
+if {$epg_style eq "grid"} { puts " selected" }
+puts ">Grid\n"
+puts "
+		</select>
+		<small>
+		<input name=epg_style value=\"set\" type=submit>
+		</small>
+		<div id=epg_style_output></div>
 		</td>
 	</form>
 	</tr>
@@ -104,10 +138,10 @@ puts "
 
 puts "
 	<tr>
-	<form id=channel_group method=get action=$env(REQUEST_URI)>
-		<th>Channel Group for EPG</th>
+	<form class=auto id=channel_group method=get action=$env(REQUEST_URI)>
+		<th class=key>Channel Group for EPG</th>
 		<td><select id=channel_group name=channel_group
-		    value=[$settings channel_group]>
+		    class=\"text ui-widget-content ui-corner-all\">
 "
 
 set i 0
@@ -123,7 +157,9 @@ foreach grp [$settings channel_groups] {
 
 puts "
 		</select>
-		<input name=channel_group value=\"change\" type=submit>
+		<small>
+		<input name=channel_group value=\"set\" type=submit>
+		</small>
 		<div id=channel_group_output></div>
 		</td>
 	</form>
@@ -132,11 +168,82 @@ puts "
 
 puts "
 	</table>
-	</form>
-	<br>
-	More coming soon...
-	<br>
-	<br>
+	</fieldset>
+	<br><br>
+	<fieldset style=\"display: inline\">
+	<legend> Email Settings </legend>
+	<table>
 "
-source /mod/var/mongoose/html/lib/footer.jim
+
+puts "
+	<tr>
+	<form class=auto id=smtp_server method=get action=$env(REQUEST_URI)>
+		<th class=key>SMTP Server for outbound email</th>
+		<td><input name=smtp_server value=\"$smtp_server\"
+		    class=\"text ui-widget-content ui-corner-all\"
+		    length=20 maxlength=50>
+		    <small>
+		    <input id=smtp_server_submit value=\"change\" type=submit>
+		    </small>
+		    <div id=smtp_server_output></div>
+		</td>
+	</form>
+	</tr>
+"
+
+puts "
+	</table>
+	</fieldset>
+	<br><br>
+	<fieldset style=\"display: inline\">
+	<legend> Advanced Settings </legend>
+	<table>
+"
+
+puts "
+	<tr>
+	<form class=auto id=pkgdev method=get action=$env(REQUEST_URI)>
+		<th class=key>Show development and advanced packages?</th>
+		<td><input name=pkgdevoff value=0 type=hidden>
+		    <input name=pkgdev id=pkgdev value=1 type=checkbox
+"
+if {$pkgdev} { puts " checked" }
+puts {
+		>
+		    <small>
+		    <input id=pkgdev_submit value="save" type=submit>
+		    </small>
+		    <div id=pkgdev_output></div>
+		</td>
+	</form>
+	</tr>
+}
+
+puts "
+	</table>
+	</fieldset>
+"
+
+eval_plugins settings
+
+puts {
+<br><br>
+<fieldset style="display: inline">
+<legend> Reset Custom Firmware </legend>
+<button id=cfwreset>
+Click to remove all packages and settings installed by the custom firmware.
+</button>
+</fieldset>
+<script type=text/javascript>
+$('#cfwreset').jConfirmAction({
+	yesAnswer: "Delete"
+}, function(el) {
+	$('html').html('Restart the Humax using the remote control.');
+	$.get('/cgi-bin/cfwreset');
+});
+</script>
+
+}
+
+footer
 

var/mongoose/cgi-bin/status.jim

@@ -3,10 +3,6 @@
 puts "Content-Type: text/html"
 puts ""
 
-#puts "<img style=\"vertical-align: middle\" src=/images/745_1_11_Video_1REC.png><span style=\"vertical-align: middle\">Recording one thing</span>"
-#puts "<img style=\"vertical-align: middle\" src=/images/745_1_11_Video_1REC.png><span style=\"vertical-align: middle\">Recording another thing</span>"
-#puts "<img style=\"vertical-align: middle\" src=/images/745_1_10_Video_2Live.png><span style=\"vertical-align: middle\">Watching something else</span>"
-
 if {[catch {set pid [exec pgrep humaxtv]}]} { exit }
 
 if {[catch {set data [exec lsof -p $pid | grep Video | fgrep .ts]} ]} {
@@ -43,9 +39,8 @@ foreach line $lines {
 
 	incr seen($name)
 
-	lappend output "<img style=\"vertical-align: middle\"
-	    src=/images/$icon><span
-	    style=\"vertical-align: middle\">$mode&nbsp;$name</span>"
+	lappend output "<img class=va src=/images/$icon><span class=va>
+	    $mode&nbsp;$name</span><br>"
 }
 
 if {[llength $output]} {

var/mongoose/cgi-bin/transmission.jim

@@ -0,0 +1,13 @@
+#!/mod/bin/jimsh
+
+set url "http://$env(HTTP_HOST):9091/"
+
+puts "Content-Type: text/html
+Location: $url
+
+<meta http-equiv=refresh content=\"0; url=$url\">
+
+Transmission is available <a href=$url>here</a>
+
+"
+

var/mongoose/cgi-bin/xepg.jim

@@ -0,0 +1,229 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+
+puts "Content-Type: text/html"
+puts ""
+header
+
+require epg.class spinner.class altrow epg_search totop
+
+cgi_input
+
+puts {<link type="text/css" href="/css/xepg.css" rel="Stylesheet" />}
+
+[spinner new {
+	text "Loading Now/Next Information..."
+	size "1.2em"
+	style "margin: 1em;"
+	}] start
+
+require epg_popup
+
+set stt [cgi_get stt [clock seconds]]
+if {$stt <= [clock seconds]} {
+	set stt [clock seconds]
+	set current 1
+} else {
+	set current 0
+}
+
+set favlist [epg favlist]
+
+set hours 4.0
+set seconds $($hours * 3600)
+
+set ostt $stt
+set stt [expr int($stt / 1800.0) * 1800]
+
+set ett $(int($stt + $seconds))
+set offset $(($ostt - $stt) / 1800.0)
+
+set chanpx 120
+set eventpx 1000
+set totalpx $($chanpx + $eventpx)
+set contwidth $($totalpx + 50)
+
+set hourpx $($eventpx / $hours)
+set minpx $($hourpx / 60.0)
+set secpx $($minpx / 60.0)
+
+set start [clock milliseconds]
+if {$::qepg} {
+	set records [epg dbfetch dump -trange "$stt:$ett"]
+} else {
+	require channelsort
+	set records [channelsort [epg fetch dump -trange "$stt:$ett"]]
+}
+set got [clock milliseconds]
+
+puts "<div id=buttons style=\"width: $eventpx; margin-left: ${chanpx}px;\">"
+if {$stt > [clock seconds]} {
+	puts "<button id=earlier>&lt;&lt;&lt; Earlier</button>"
+}
+puts "<button id=later>Later &gt;&gt;&gt;</button>"
+puts "</div>"
+
+puts "
+<div id=xepg style=\"min-width: ${contwidth}px; overflow: auto\">
+<div id=xepgnow></div>
+<div id=xegrid>
+"
+
+puts "<div id=epgdate style=\"width: ${eventpx}px; margin-left: ${chanpx}px;\">"
+puts [clock format $stt -format {%a %D}]
+puts "</div>"
+
+puts "<div class=xechan style=\"width: ${chanpx}px;\">&nbsp;</div>"
+for {set i 0} {$i < $hours * 2} {incr i} {
+	puts "<div class=xetime id=xe$i
+	    style=\"width: [expr $minpx * 30]px\">"
+	puts "[clock format $($stt + 1800 * $i) -format "%H:%M"]</div>"
+}
+
+set lim 0
+set lcn 0
+set bg "odd"
+
+foreach e $records {
+	if {$favlist != "" && [$e get service_id] ni $favlist} {
+		continue
+	}
+	set chnum [$e get channel_num]
+	if {$chnum == 0} { continue }
+
+	if {$chnum != $lcn} {
+		puts "<div class=xechan style=\"width: ${chanpx}px;\">"
+
+		puts "[$e channel_icon 30]&nbsp;"
+		puts "$chnum
+	    <a href=/cgi-bin/epg_service.jim?service=[$e get service_id]
+		title=\"[$e get channel_name]\">
+	    [$e get channel_name]
+	    </a></div>"
+
+		set lcn $chnum
+		set le 0
+		set pos 0
+		if {$bg eq "odd"} { set bg "even" } else { set bg "odd" }
+	}
+
+	set es [$e get start]
+	set ee [expr $es + [$e get duration]]
+
+	if {$es < $le} continue
+
+	if {$es < $stt} { set es $stt }
+	if {$ee > $ett} { set ee $ett }
+	set le $ee
+
+	set left [expr int(($es - $stt) * $secpx)]
+	set right [expr int(($ee - $stt - 1) * $secpx)]
+	set px $($right - $left)
+	if {$pos < $left} {
+		set px $($px + $left - $pos - 1)
+	} elseif {$pos > $left} {
+		set px $($px - ($pos - $left - 1))
+	}
+	incr pos $px
+
+	$e process_sched
+
+	set recopts 1
+	if {[$e get series_crid] ne ""} { set recopts 2 }
+
+	set perc [$e percent]
+	set showing 0
+	if {$perc > 0 && $perc < 100} { set showing 1 }
+
+	set txt "[cgi_quote_html [$e get name]] <span>([\
+	    clock format $es -format "%H:%M"] - [\
+	    clock format $ee -format "%H:%M"])"
+	if {$showing} { append txt " ($perc%)" }
+	append txt "</span>"
+
+	set htxt "[cgi_quote_html [$e get name]] ([\
+	    clock format $es -format "%H:%M"] - [\
+	    clock format $ee -format "%H:%M"])"
+	if {$showing} { append hxt " ($perc%)" }
+
+	puts "<div class=\"xeprog $bg\"
+	    style=\"width: [expr $px - 4]px;\" title=\"$htxt\">
+	    <a class=event href=# xs=[$e get service_id]
+		xe=[$e get event_id] sch=[$e get sched_type]
+		rec=$recopts>"
+	puts $txt
+	puts "</a>"
+	puts "</div>"
+}
+puts "<div id=keypos style=\"float: left; clear: left;\"></div>"
+puts "</div>"
+puts "</div>"
+
+set earlier $($stt - 3600 * 4)
+
+puts "
+
+<div style=\"clear: both;\">
+<small><button id=epgswitch>
+	Switch to standard now/next display.
+</button></small>
+</div>
+
+<script type=text/javascript>
+\$(document).ready(function() {
+
+\$('#epgswitch').button().click(function() {
+	window.location = '/epg.shtml';
+});
+\$('#earlier').button().click(function() {
+	window.location = '/cgi-bin/xepg.jim?stt=$earlier';
+});
+\$('#later').button().click(function() {
+	window.location = '/cgi-bin/xepg.jim?stt=$ett';
+});
+"
+
+if {$current} {
+	puts {
+
+var kt = $('#xe0');
+var ktpos = kt.position();
+
+var height = $('#keypos').position().top - ktpos.top;
+
+	}
+	puts "var nowpos = ktpos.left + (kt.width() * $offset);"
+	puts {
+if (window.console)
+	console.log('NOWPOS: %d', nowpos);
+$('#xepgnow')
+	.css('left', nowpos + 'px')
+	.css('top', ktpos.top)
+	.height(height)
+	.show('slow');
+	}
+}
+
+puts "
+});
+</script>
+"
+
+puts "
+	<a href=/cgi-bin/settings.jim>
+	<img border=0 height=14 src=/images/421_1_00_CH_Title_2R_Arrow.png>
+	Visit settings to change EPG options.
+	</a><br>
+"
+
+set end [clock milliseconds]
+puts "<font class=footnote>
+    Retrieved in: [expr [expr $got - $start] / 1000.0] seconds.
+    </font>"
+
+epg cleanup
+
+footer
+

var/mongoose/html/backup.shtml

@@ -1,4 +1,4 @@
-<!--#include virtual="/lib/header.shtml" -->
-<!--#exec cmd="/mod/var/mongoose/include/db.jim" -->
-<!--#include virtual="/lib/footer.shtml" -->
-
+<!--#include virtual="/lib/header.shtml" -->
+<!--#exec cmd="/mod/var/mongoose/include/backup.jim" -->
+<!--#include virtual="/lib/footer.shtml" -->
+

var/mongoose/html/css/iphone-style-checkboxes.css

@@ -0,0 +1,75 @@
+.iPhoneCheckContainer {
+  position: relative;
+  height: 27px;
+  cursor: pointer;
+  overflow: hidden; }
+  .iPhoneCheckContainer input {
+    position: absolute;
+    top: 5px;
+    left: 30px;
+    opacity: 0;
+    -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
+    filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0); }
+  .iPhoneCheckContainer label {
+    white-space: nowrap;
+    font-size: 17px;
+    line-height: 17px;
+    font-weight: bold;
+    font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
+    text-transform: uppercase;
+    cursor: pointer;
+    display: block;
+    height: 27px;
+    position: absolute;
+    width: auto;
+    top: 0;
+    padding-top: 5px;
+    overflow: hidden; }
+  .iPhoneCheckContainer, .iPhoneCheckContainer label {
+    user-select: none;
+    -moz-user-select: none;
+    -khtml-user-select: none; }
+
+.iPhoneCheckDisabled {
+  opacity: 0.5;
+  -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50);
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50); }
+
+label.iPhoneCheckLabelOn {
+  color: white;
+  background: url('/img/iphone-style-checkboxes/on.png?1282083753') no-repeat;
+  text-shadow: 0px 0px 2px rgba(0, 0, 0, 0.6);
+  left: 0;
+  padding-top: 5px; }
+  label.iPhoneCheckLabelOn span {
+    padding-left: 8px; }
+label.iPhoneCheckLabelOff {
+  color: #8b8b8b;
+  background: url('/img/iphone-style-checkboxes/off.png?1282083753') no-repeat right 0;
+  text-shadow: 0px 0px 2px rgba(255, 255, 255, 0.6);
+  text-align: right;
+  right: 0; }
+  label.iPhoneCheckLabelOff span {
+    padding-right: 8px; }
+
+.iPhoneCheckHandle {
+  display: block;
+  height: 27px;
+  cursor: pointer;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 0;
+  background: url('/img/iphone-style-checkboxes/slider_left.png?1282083753') no-repeat;
+  padding-left: 3px; }
+
+.iPhoneCheckHandleRight {
+  height: 100%;
+  width: 100%;
+  padding-right: 3px;
+  background: url('/img/iphone-style-checkboxes/slider_right.png?1282083753') no-repeat right 0; }
+
+.iPhoneCheckHandleCenter {
+  height: 100%;
+  width: 100%;
+  background: url('/img/iphone-style-checkboxes/slider_center.png?1282083753'); }

var/mongoose/html/css/jconfirmaction.jquery.css

@@ -0,0 +1,37 @@
+
+.jcaquestion {
+	position: absolute;
+	display: inline;
+	text-align: center;
+	width: 174px;
+	height: 78px;
+	font-size: 13px;
+	line-height: 1.5em;
+	background: url('/img/bubble.png') left top no-repeat;
+	padding: 10px 0 0 0;
+	text-shadow: 0px 1px 0px #fff;
+	margin-left: -7em;
+	margin-top: -6em;
+	opacity: 0;
+}
+
+.jcayes, .jcacancel {
+	margin-top: .5em;
+	margin-right: .5em;
+	cursor: pointer;
+	display: inline-block;
+	width: 63px;
+	height: 21px;
+	color: #fff;
+	text-shadow: 0px 1px 0px #000;
+	background: url('/img/button.png') left top no-repeat;
+}
+
+.jcatitle {
+	font-size: 30px;
+	margin-bottom: 1.5em;
+	font-weight: bold;
+	font-style: italic;
+	text-shadow: 0px 2px 0px #fff;
+}
+

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

@@ -1,62 +1,62 @@
-/* Generic context menu styles */
-.contextMenu {
-	position: absolute;
-	width: 120px;
-	z-index: 99999;
-	border: solid 1px #CCC;
-	background: #EEE;
-	padding: 0px;
-	margin: 0px;
-	display: none;
-}
-
-.contextMenu LI {
-	list-style: none;
-	padding: 0px;
-	margin: 0px;
-}
-
-.contextMenu A {
-	color: #333;
-	text-decoration: none;
-	display: block;
-	line-height: 20px;
-	height: 20px;
-	background-position: 6px center;
-	background-repeat: no-repeat;
-	outline: none;
-	padding: 1px 5px;
-	padding-left: 28px;
-}
-
-.contextMenu LI.hover A {
-	color: #FFF;
-	background-color: #3399FF;
-}
-
-.contextMenu LI.disabled A {
-	color: #AAA;
-	cursor: default;
-}
-
-.contextMenu LI.hover.disabled A {
-	background-color: transparent;
-}
-
-.contextMenu LI.separator {
-	border-top: solid 1px #CCC;
-}
-
-/*
-	Adding Icons
-	
-	You can add icons to the context menu by adding
-	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); }
+/* Generic context menu styles */
+.contextMenu {
+	position: absolute;
+	width: 150px;
+	z-index: 99999;
+	border: solid 1px #CCC;
+	background: #EEE;
+	padding: 0px;
+	margin: 0px;
+	display: none;
+}
+
+.contextMenu LI {
+	list-style: none;
+	padding: 0px;
+	margin: 0px;
+}
+
+.contextMenu A {
+	color: #333;
+	text-decoration: none;
+	display: block;
+	line-height: 20px;
+	height: 20px;
+	background-position: 6px center;
+	background-repeat: no-repeat;
+	outline: none;
+	padding: 1px 5px;
+	padding-left: 28px;
+}
+
+.contextMenu LI.hover A {
+	color: #FFF;
+	background-color: #3399FF;
+}
+
+.contextMenu LI.disabled A {
+	color: #AAA;
+	cursor: default;
+}
+
+.contextMenu LI.hover.disabled A {
+	background-color: transparent;
+}
+
+.contextMenu LI.separator {
+	border-top: solid 1px #CCC;
+}
+
+/*
+	Adding Icons
+	
+	You can add icons to the context menu by adding
+	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); }

var/mongoose/html/css/jquery.progressbar.css

@@ -0,0 +1,31 @@
+
+/* progress bar container */
+#progressbar{
+	border:1px solid black;
+	width:200px;
+	height:20px;
+	position:relative;
+	color:black; 
+}
+/* color bar */
+#progressbar div.progress{
+	position:absolute;
+	width:0;
+	height:100%;
+	overflow:hidden;
+	background-color:#369;
+}
+/* text on bar */
+#progressbar div.progress .text{
+	position:absolute;
+	text-align:center;
+	color:white;
+}
+/* text off bar */
+#progressbar div.text{
+	position:absolute;
+	width:100%;
+	height:100%;
+	text-align:center;
+}
+

var/mongoose/html/css/style.css

@@ -52,6 +52,13 @@ div.footer
 	padding-top: 2em;
 }
 
+div.warningbox
+{
+	background: url('/img/redshade.png') repeat-x;
+	padding: 0.5em;
+	margin: 1em;
+}
+
 table
 {
 	empty-cells: show;
@@ -63,13 +70,13 @@ table.borders, table.borders td, table.borders th
 	empty-cells: show;
 }
 
-table tr.odd
+.odd
 {
 	background: #ccff99;
 	color: black;
 }
 
-table tr.even
+.even
 {
 	background: #ffffcc;
 	color: black;
@@ -86,7 +93,7 @@ table th
 	text-align: left;
 }
 
-table.keyval th
+table.keyval th, th.key
 {
 	background: #ccff99;
 	font-weight: bold;
@@ -101,7 +108,7 @@ table.keyval td
 	color: black;
 }
 
-pre
+pre, .pre
 {
         font-family: Consolas, 'Courier New', Courier, monospace;
         color: black;
@@ -174,6 +181,12 @@ pre
 	background: transparent;
 }
 
+.filesize
+{
+	color: #6a6aff;
+	background: transparent;
+}
+
 .footnote
 {
 	color: #ff4000;
@@ -225,3 +238,23 @@ img.progress
 	vertical-align: middle;
 }
 
+.block
+{
+	display: block;
+}
+
+.hidden
+{
+	display: none;
+}
+
+input.text
+{
+	padding: .4em;
+}
+
+.highlight
+{
+	background-color: yellow;
+}
+

var/mongoose/html/css/tsort.css

@@ -0,0 +1,21 @@
+
+table.tablesorter .header {
+	background-image: url(/img/tsort/bg.png);
+	background-repeat: no-repeat;
+	border-left: 1px solid #FFF;
+	border-right: 1px solid #000;
+	border-top: 1px solid #FFF;
+	padding-left: 30px;
+	padding-top: 8px;
+	height: auto;
+}
+
+table.tablesorter .headerSortUp {
+	background-image: url(/img/tsort/asc.png);
+	background-repeat: no-repeat;
+}
+
+table.tablesorter .headerSortDown {
+	background-image: url(/img/tsort/desc.png);
+	background-repeat: no-repeat;
+}

var/mongoose/html/css/ui.totop.css

@@ -0,0 +1,30 @@
+
+#toTop {
+    background: url("/img//ui.totop.png") no-repeat scroll left top transparent;
+    border: medium none;
+    bottom: 110px;
+    display: none;
+    height: 51px;
+    margin-left: 50px;
+    overflow: hidden;
+    position: fixed;
+    text-decoration: none;
+    text-indent: -999px;
+    width: 77px;
+    z-index: 2000;
+}
+
+#toTopHover {
+    background: url("/img/ui.totop.png") no-repeat scroll left -51px transparent;
+    display: block;
+    float: left;
+    height: 51px;
+    opacity: 0;
+    overflow: hidden;
+    width: 77px;
+}
+
+#toTop:active, #toTop:focus {
+    outline: medium none;
+}
+

var/mongoose/html/css/xepg.css

@@ -0,0 +1,113 @@
+div#xepg
+{
+	position: relative;
+}
+
+div#xepgnow
+{
+	display: none;
+	position: absolute;
+	width: 2px;
+	height: 100%;
+	background: yellow;
+	top: 0px;
+	left: 0px;
+	z-index: 9999;
+	box-shadow: 2px 2px 11px #666;
+	-moz-box-shadow: 2px 2px 11px #666;
+	-webkit-box-shadow: 2px 2px 11px #666;
+	opacity:0.7;
+	/*filter:alpha(opacity=70);*/
+}
+
+div.xetick
+{
+	display: none;
+	position: absolute;
+	width: 1px;
+	height: 100%;
+	background: #ccc;
+	top: 0px;
+	left: 0px;
+/*
+	z-index: 9999;
+	box-shadow: 2px 2px 11px #666;
+	-moz-box-shadow: 2px 2px 11px #666;
+	-webkit-box-shadow: 2px 2px 11px #666;
+	opacity:0.7;
+*/
+	/*filter:alpha(opacity=70);*/
+}
+
+div#epgdate
+{
+	border-left: 1px solid #669933;
+	border-right: 1px solid #669933;
+	border-top: 1px solid #669933;
+	clear: left;
+	float: left;
+}
+
+/*
+div#xegrid
+{
+}
+*/
+
+div.xerow
+{
+}
+
+div.xechan
+{
+	vertical-align: middle;
+	float: left;
+	clear: left;
+	white-space: nowrap;
+	overflow: hidden;
+	height: 25px;
+	padding: 3px 0;
+	margin: 3px 0;
+}
+
+div.xechan img
+{
+	vertical-align: middle;
+}
+
+div.xetime
+{
+	float: left;
+	border-left: 1px solid #669933;
+}
+
+div.xeprog
+{
+	overflow: hidden;
+	white-space: nowrap;
+	float: left;
+	vertical-align: middle;
+	height: 25px;
+	padding: 4px 0 3px 2px;
+	margin: 3px 0 3px 2px;
+	border: 1px solid #ccc;
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+}
+
+div.xeprog span
+{
+	font-style: italic;
+	font-size: 0.7em;
+}
+
+div#buttons
+{
+	padding: 0.5em;
+}
+
+button#later
+{
+	margin-left: 2em;
+}
+

var/mongoose/html/epg.shtml

@@ -1,9 +1,4 @@
 <!--#include virtual="/lib/header.shtml" -->
-<form method=get action=/cgi-bin/epg_search.jim>
-Search EPG: <input name=term size=20 maxlength=255>
-<input type=checkbox name=full>Search descriptions as well as titles.
-<input type=submit value=Search>
-</form>
 <!--#exec cmd="/mod/var/mongoose/include/epg.jim" -->
 <!--#include virtual="/lib/footer.shtml" -->
 

var/mongoose/html/img/channels/1-2-1 Dating.png

@@ -0,0 +1 @@
+blank.png

var/mongoose/html/img/channels/CONNECT.png

@@ -0,0 +1 @@
+blank.png

var/mongoose/html/img/channels/S4/C.png

@@ -0,0 +1 @@
+../S4C.png

var/mongoose/html/img/channels/STREAM.png

@@ -0,0 +1 @@
+blank.png

var/mongoose/html/img/channels/Sky Text.png

@@ -0,0 +1 @@
+blank.png

var/mongoose/html/img/channels/The Jewellery Channel.png

@@ -0,0 +1 @@
+blank.png

var/mongoose/html/img/channels/VISION.png

@@ -0,0 +1 @@
+blank.png