scheduling updates

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

CONTROL/control

@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 0.6.0-1
+Version: 0.6.0-2
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
 Depends: mongoose(>=2.11-6),jim(>=0.71-1),jim-sqlite3(>=0.71-1),jim-cgi(>=0.3),jim-oo,jim-pack,service-control,busybox(>=1.18.3-1),lsof,epg(>=1.0.2),hmt(>=1.0.6),ssmtp

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

@@ -6,7 +6,7 @@ source /mod/var/mongoose/lib/setup
 set dir /mod/var/backup
 
 puts "Content-Type: text/html"
-puts "Pragma: nocache"
+puts "Pragma: no-cache"
 puts "Expires: Thu, 01 Jan 1970 00:00:00 GMT"
 puts ""
 

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

@@ -3,7 +3,7 @@
 package require cgi
 
 puts "Content-Type: text/html"
-puts "Pragma: nocache"
+puts "Pragma: no-cache"
 puts "Expires: Thu, 01 Jan 1970 00:00:00 GMT"
 puts ""
 

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

@@ -13,7 +13,7 @@ puts ""
 cgi_input
 #cgi_dump
 
-#set _cgi(restore_file) "backup-2011-Jul-05-19:22"
+#set _cgi(restore_file) "backup-2011-Jul-09-20:37"
 
 if {![dict exists $_cgi restore_file]} {
 	puts "No filename supplied."
@@ -53,7 +53,8 @@ proc findhsvc {channel} {
 
 puts "Restoring scheduled events..."
 
-$rsvdb query {delete from TBL_RESERVATION}
+$rsvdb query {begin transaction;}
+$rsvdb query {delete from TBL_RESERVATION;}
 
 set fields [lsort [[rsv] vars]]
 
@@ -96,7 +97,10 @@ foreach line $data {
 	if {!$bad} { $rsv insert }
 }
 
+$rsvdb query {commit transaction;}
+
 puts "Restoring favourite channels..."
+$rsvdb query {begin transaction;}
 $rsvdb query {delete from channel.TBL_FAV}
 
 set grp 0
@@ -129,6 +133,8 @@ foreach line $data {
 	$rsvdb query $query
 }
 
+$rsvdb query {commit transaction;}
+
 close [open /tmp/.restartpending w]
 
 close $fd

var/mongoose/cgi-bin/db.jim

@@ -0,0 +1,71 @@
+#!/mod/bin/jimsh
+
+package require cgi
+package require sqlite3
+source /mod/var/mongoose/lib/setup
+require altrow
+
+puts "Content-Type: text/html"
+puts ""
+
+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
+}
+
+db_info /var/lib/humaxtv/rsv.db
+db_info /var/lib/humaxtv/setup.db
+db_info /var/lib/humaxtv/channel.db
+db_info /mnt/hd2/dms_cds.db
+
+footer
+

var/mongoose/cgi-bin/epg_info.jim

@@ -35,7 +35,13 @@ puts "
 		<td>[clock format [$record get start] -format {%c %Z}]</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>
@@ -103,6 +109,8 @@ puts "
 	</a>
 "
 
+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,83 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require epg.class
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+#set _cgi(service) 4170
+#set _cgi(event) 38584
+#set _cgi(type) 2
+
+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
+}
+
+$event get_channel_info
+
+set args {}
+
+set args(ersvtype)		3
+set args(hsvc)			[$event get channel_hsvc]
+set args(nsttime)		[$event get start]
+set args(nduration)		[$event get duration]
+set args(usevtid)		[$event get event_id]
+set args(szevtname)		"\025[$event get name]"
+set args(eReady)		30
+
+set ccrid [$event get channel_crid]
+
+if {$type == 1} {
+	# Event
+	set args(ucCRIDType)		49
+	set args(ucRecKind)		1
+	set args(szCRID) 		"$ccrid[$event get event_crid]"
+	set args(szEventToRecord)	"1$args(szCRID)|"
+} else {
+	# Series
+	set args(ucCRIDType)		50
+	set args(ucRecKind)		4
+	set args(szCRID)		"$ccrid[$event get series_crid]"
+	set args(szFPBRecPath)		"$args(szevtname)"
+	set progs [lmap i [epg fetch dump -scrid [$event get series_crid]] {
+		if {[set ecrid [$i get event_crid]] eq ""} { continue }
+		list "1$::ccrid$ecrid"
+	}]
+	set args(szEventToRecord)	 "[join $progs "|"]|"
+}
+
+#puts $args
+
+set msg ""
+if {![file exists /mod/.schedule.testing]} { set msg "Disabled during testing" }
+if {$msg ne "" || [catch {[rsv new $args] insert} msg]} {
+	puts "Error encountered while scheduling the recording: <i>$msg</i>"
+} else {
+	puts "Successfully scheduled recording of <i>[$event get name]</i>"
+	close [open /tmp/.restartpending w]
+}
+
+epg cleanup
+

var/mongoose/cgi-bin/epg_service.jim

@@ -54,6 +54,7 @@ puts {
 set i 0
 foreach record $records {
 	altrow
+	$record get_channel_info
 	if {[$record showing]} {
 	    puts "<td><img src=/images/111_1_00_Cursor_2R_Arrow.png></td>"
 	} else { puts "<td></td>" }

var/mongoose/cgi-bin/opkg.jim

@@ -1,8 +1,11 @@
 #!/mod/bin/jimsh
 
 package require cgi
+source /mod/var/mongoose/lib/setup
+require pkg.class
 
 puts "Content-Type: text/html"
+puts "Transfer-Encoding: chunked"
 puts ""
 
 cgi_input
@@ -10,9 +13,33 @@ cgi_input
 
 #set _cgi(cmd) {remove binutils}
 
-if {![dict exists $_cgi cmd]} { set _cgi(cmd) status }
+if {![dict exists $_cgi cmd]} { set _cgi(cmd) update }
 
 set cmd [dict get $_cgi cmd]
 
-puts [exec /mod/var/mongoose/lib/opkg {*}$cmd]
+proc chunk {chk} {
+	puts -nonewline [format "%x\r\n" [string length $chk]]
+	puts -nonewline "$chk\r\n"
+	flush stdout
+}
+
+# Kick the browser into life...
+chunk [string range [format "%301d" 0] 1 end-1]
+
+#puts [exec /mod/var/mongoose/lib/opkg {*}$cmd]
+set bcmd "|/mod/var/mongoose/lib/opkg $cmd"
+set fd [open $bcmd r]
+while {[gets $fd line] >= 0} {
+	chunk "$line\r\n"
+}
+close $fd
+
+if {$cmd eq "update"} {
+	chunk "Updating package meta information\r\n"
+	pkg fetchmeta
+	chunk "Done.\r\n"
+}
+
+chunk ""
+puts "\r\n"
 

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=[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

@@ -3,6 +3,7 @@
 puts "Content-Type: text/html"
 puts ""
 
-puts [exec /etc/init.d/S90settop restart]
-file delete /tmp/.restartpending
+#puts [exec /etc/init.d/S90settop restart]
+#file delete /tmp/.restartpending
+puts [exec killall humaxtv]
 

var/mongoose/cgi-bin/settings.jim

@@ -16,6 +16,7 @@ set settings [settings new]
 set hostname [$settings hostname]
 set smtp_server [$settings smtp_server]
 set channel_group [$settings channel_group]
+set pkgdev [$settings pkgdev]
 
 # Handle updates
 
@@ -50,6 +51,10 @@ 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"
+if {[dict exists $_cgi pkgdevoff] && ![dict exists $_cgi pkgdev]} {
+	set _cgi(pkgdev) 0
+}
+handle_int_update pkgdev $pkgdev "Development Package Display"
 
 header
 
@@ -76,6 +81,9 @@ puts {
 }
 
 puts "
+<link href=/css/iphone-style-checkboxes.css rel=stylesheet type=text/css />
+<script type=\"text/javascript\" src=\"/js/iphone-style-checkboxes.js\">
+</script>
 	<fieldset style=\"display: inline\">
 		<legend>
 			General Settings
@@ -155,6 +163,34 @@ puts "
 	</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>

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/html/css/jquery.contextMenu.css

@@ -1,7 +1,7 @@
 /* Generic context menu styles */
 .contextMenu {
 	position: absolute;
-	width: 140px;
+	width: 150px;
 	z-index: 99999;
 	border: solid 1px #CCC;
 	background: #EEE;

var/mongoose/html/db.shtml

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

var/mongoose/html/index.shtml

@@ -41,7 +41,7 @@ $(document).ready(function() {
 	</a>
 	<br>
 	<a href=/sched.shtml>
-	<b>Scheduled Recordings</b>
+	<b>Scheduled Events</b>
 	</a>
 	<br>
 	</center>
@@ -60,7 +60,7 @@ $(document).ready(function() {
 </div>
 </div>
 
-<div style="clear: both">
+<div style="clear: both; padding-top: 1em">
 
 <div style="float: left">
 	<center>
@@ -77,11 +77,11 @@ $(document).ready(function() {
 
 <div style="float: left">
 	<center>
-	<a href=/packages.shtml>
+	<a href=/pkg.shtml>
 	<img src=/img/packages.jpg border=0 width=217 height=228>
 	</a>
 	<br>
-	<a href=/packages.shtml>
+	<a href=/pkg.shtml>
 	<b>Package Management</b>
 	</a>
 	<br>
@@ -106,11 +106,12 @@ $(document).ready(function() {
 
 <div style="clear: both">
 <!--#exec cmd="/mod/var/mongoose/include/mediatomb.jim" -->
+<!--#exec cmd="/mod/var/mongoose/include/transmission.jim" -->
 </div>
 <div class=footer>
 <ul>
 <li>
-<a href=/db.shtml target=_blank>SQLite3 Database Dump</a>
+<a href=/cgi-bin/db.jim target=_blank>SQLite3 Database Dump</a>
 </li><li>
 <a href=/jim/ref.html target=_blank>Jim Reference Manual</a> |
 <a href=/jim/oo.html target=_blank>OO</a> |

var/mongoose/html/js/packages.js

@@ -1,33 +0,0 @@
-
-$(document).ready(function() {
-	$('button').button();
-
-	var $dialog = $('#dialogue').dialog({
-		title: "Package Management Results",
-		modal: false, autoOpen: false,
-		height: 500, width: 700,
-		show: 'scale', hide: 'fade',
-		draggable: true, resizable: true,
-		buttons: { "Close":
-		    function() {$(this).dialog('close');}},
-		close: function(e,u) { window.location.reload(true); }
-	});
-
-	var opkg = '/cgi-bin/opkg.jim?cmd=';
-
-	$('#opkgupdate').click(function() {
-		$('#result_txt').load(opkg + 'update');
-		$('#results').show('slow');
-	});
-
-	$('button.remove, button.install, button.upgrade').click(function() {
-		$('#dspinner').show();
-		$('#dresults').load(
-		    opkg + encodeURIComponent(
-		        $(this).attr('action') + ' ' + $(this).attr('id')
-		    ),
-		    function() { $('#dspinner').hide('slow') });
-		$dialog.dialog('open');
-	});
-});
-

var/mongoose/html/lib/header.jim

@@ -6,8 +6,6 @@ puts {
 source /mod/var/mongoose/include/model.jim
 puts {
 </title>
-<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" />     
@@ -18,7 +16,9 @@ puts {
 }
 
 source /mod/var/mongoose/html/lib/topbar.jim
+puts "<div id=restart_block>"
 source /mod/var/mongoose/include/restart.jim
+puts "</div>"
 
 puts {
 <div style="clear: both">

var/mongoose/html/lib/header.shtml

@@ -12,7 +12,9 @@
 <body>
 
 <!--#include virtual="/lib/topbar.shtml" -->
+<div id=restart_block>
 <!--#exec cmd="/mod/var/mongoose/include/restart.jim" -->
+</div>
 
 <div style="clear: both">
 

var/mongoose/html/packages.shtml

@@ -1,21 +0,0 @@
-<!--#include virtual="/lib/header.shtml" -->
-
-<h1 class=vam>Package Management
-<button class=vam id=opkgupdate>Update package list from Internet</button>
-</h1>
-<div id=results class=shadowbox style="width: 90%; display: none; margin: 1 0 1em 0">
-<div>
-<pre id=result_txt>
-Results...
-</pre>
-</div>
-</div>
-
-<div id=dialogue style="display: none; align: center">
-<pre id=dresults></pre>
-<div id=dspinner><img src=/img/loading.gif>Processing...</div>
-</div>
-
-<!--#exec cmd="/mod/var/mongoose/include/packages.jim" -->
-
-<!--#include virtual="/lib/footer.shtml" -->

var/mongoose/html/pkg.shtml

@@ -0,0 +1,115 @@
+<!--#include virtual="/lib/header.shtml" -->
+
+<style type=text/css>
+button.install
+{
+	display: none;
+	background-image: none;
+	background: #ccff99;
+}
+button.remove
+{
+	display: none;
+	background-image: none;
+	background: #ff6666;
+}
+button.upgrade
+{
+	display: none;
+}
+</style>
+
+<div class=va style="padding: 0 0 1em 0">
+<h1 style="display: inline" class=va>Package Management</h1>
+<small>
+<button class=va id=opkgupdate style="display: none">
+Update package list from Internet
+</button>
+</small>
+</div>
+
+<div id=results class=shadowbox
+    style="width: 90%; display: none; margin: 1 0 1em 0">
+	<div>
+		<pre id=result_txt>
+		Updating package list...
+		</pre>
+	</div>
+</div>
+
+<div id=dialogue style="display: none; align: center">
+	<pre id=dresults></pre>
+	<div id=dspinner><img border=0 src=/img/loading.gif>Processing request...</div>
+</div>
+
+<script type=text/javascript>
+
+var opkg = '/cgi-bin/opkg.jim?cmd=';
+
+$(document).ready(function() {
+	$('#opkgupdate').button().show('slow');
+
+	$('#pkgtabs').tabs({
+		load: setup_buttons,
+		spinner: '<img border=0 src=/img/loading.gif> ' +
+		    '<em>Loading...</em>'
+	});
+
+	var $dialog = $('#dialogue').dialog({
+		title: "Package Management Results",
+		modal: false, autoOpen: false,
+		height: 500, width: 700,
+		show: 'scale', hide: 'fade',
+		draggable: true, resizable: true,
+		buttons: { "Close":
+		    function() {$(this).dialog('close');}},
+		close: function(e,u) { window.location.reload(true); }
+	});
+
+	function setup_buttons()
+	{
+		$('button.remove, button.install, button.upgrade')
+		    .button()
+		    .click(function() {
+			if ($(this).attr('action') == 'remove' &&
+			    !confirm('Please confirm removal of the ' +
+			    $(this).attr('id') + ' package.'))
+				return;
+			$('#dspinner').show();
+			$('#dresults').load(opkg + encodeURIComponent(
+			    $(this).attr('action') + ' ' + $(this).attr('id')),
+			    function() { $('#dspinner').hide('slow') });
+			$dialog.dialog('open');
+		}).fadeIn('slow');
+	}
+
+	$('#opkgupdate').click(function() {
+		$('#result_txt').load(opkg + 'update', function() {
+			$('#results').delay(3000).slideUp('slow');
+		});
+		$('#results').slideDown('slow');
+	});
+});
+
+
+</script>
+
+<div id=pkgtabs>
+<ul>
+	<li>
+		<a href=/cgi-bin/pkg.jim?type=inst>
+		<span>Installed</span>
+		</a>
+	</li><li>
+		<a href=/cgi-bin/pkg.jim?type=upgr>
+		<span>Upgrades</span>
+		</a>
+	</li><li>
+		<a href=/cgi-bin/pkg.jim?type=avail>
+		<span>Available</span>
+		</a>
+	</li>
+</ul>
+</div>
+
+<!--#include virtual="/lib/footer.shtml" -->

var/mongoose/include/backup.jim

@@ -7,7 +7,6 @@ puts {
 <script type=text/javascript src=/cgi-bin/backup/backup.js></script>
 <h2>Backup/Restore</h2>
 
-<div id=restart_block></div>
 <div id=restore_warning class="hidden warningbox">
 <center>
 <b>!!!!!!!!!!!!!! PLEASE NOTE !!!!!!!!!!!!!!

var/mongoose/include/db.jim

@@ -1,45 +0,0 @@
-#!/mod/bin/jimsh
-
-package require sqlite3
-source /mod/var/mongoose/lib/setup
-require altrow
-
-proc db_info {db_file} {
-	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>$db_file</h1>"
-	
-	foreach table $tables {
-		set table_name [lindex $table 1]
-		set columns [$db query "pragma table_info($table_name)"]
-		set datas [$db query "SELECT * FROM $table_name"]
-		
-		puts "<h2>$table_name</h2>"
-		puts "<table>"
-		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
-}
-
-puts {<style type="text/css">table, td, th {border-collapse:collapse; border:1px solid black;}</style>}
-db_info /var/lib/humaxtv/rsv.db
-db_info /var/lib/humaxtv/setup.db
-db_info /var/lib/humaxtv/channel.db
-#db_info /mnt/hd2/dms_cds.db
-

var/mongoose/include/diskspace.jim

@@ -6,7 +6,7 @@ if {[os.gethostname] eq "hosting"} {
 	set perc "10"
 } else {
 	foreach df [split [exec df -h 2>>/dev/null] "\n\r"] {
-		if [string match *sd*2* $df] {
+		if [string match *sd?2* $df] {
 			regsub -all -- {[[:space:]]+} $df " " df
 			set fields [split $df]
 			set size [lindex $fields 1]

var/mongoose/include/mediatomb.jim

@@ -12,7 +12,7 @@ puts "
 <div style=\"float: left; padding-top: 5em\">
 	<center>
 	<a href=$url>
-	<img src=/img/mediatomb.png width=180>
+	<img border=0 src=/img/mediatomb.png width=180>
 	</a>
 	<br>
 	<a href=$url>

var/mongoose/include/packages.jim

@@ -1,59 +0,0 @@
-#!/mod/bin/jimsh
-
-source /mod/var/mongoose/lib/setup
-require pkg.class
-
-puts {
-
-<style type=text/css>
-.ui-button, .ui-button-text { padding: 0; font-size: 12px; }
-</style>
-
-<script type=text/javascript src=/js/packages.js></script>
-
-<table class=borders>
-<tr>
-	<th>Package</th>
-	<th>Installed</th>
-	<th>Avail</th>
-	<th>Description</th>
-</tr>
-
-}
-
-set avail [pkg avail]
-foreach name [lsort [array names avail]] {
-	set pkg [pkg load $name $avail($name)]
-
-	if {![$pkg is installed]} {
-		puts "<tr>"
-	} elseif {[$pkg is upgradable]} {
-		puts "<tr class=yellowshade>"
-	} else {
-		puts "<tr class=greenshade>"
-	}
-
-	puts "
-		<td>$name</td>
-		<td>[$pkg get installed]</td>
-		<td>[$pkg get latest]</td>
-		<td>[$pkg get descr]</td>
-	"
-
-	if {![$pkg is installed]} {
-		set type Install
-	} elseif {[$pkg is upgradable]} {
-		set type Upgrade
-	} else {
-		set type Remove
-	}
-
-	puts "<td align=center><button id=\"$name\"
-	    action=[string tolower $type]
-	    class=[string tolower $type]>$type</button></td>"
-
-	puts "</tr>"
-}
-
-puts "</table>"
-

var/mongoose/include/pkg.jim

@@ -0,0 +1,46 @@
+#!/mod/bin/jimsh
+
+source /mod/var/mongoose/lib/setup
+
+puts {
+<script type=text/javascript src=/js/packages.js></script>
+
+<style type=text/css>
+button.install
+{
+	display: none;
+	background-image: none;
+	background: #ccff99;
+}
+button.remove
+{
+	display: none;
+	background-image: none;
+	background: #ff6666;
+}
+button.upgrade
+{
+	display: none;
+}
+</style>
+
+<div id=pkgtabs>
+<ul>
+	<li>
+		<a href=/cgi-bin/pkg.jim?type=inst>
+		<span>Installed</span>
+		</a>
+	</li><li>
+		<a href=/cgi-bin/pkg.jim?type=upgr>
+		<span>Upgrades</span>
+		</a>
+	</li><li>
+		<a href=/cgi-bin/pkg.jim?type=avail>
+		<span>Available</span>
+		</a>
+	</li>
+</ul>
+</div>
+}
+
+

var/mongoose/include/restart.jim

@@ -7,7 +7,7 @@ puts {
 	<div style="width: 60%; height: 0.7em;
 	    background: url(/img/stripes.gif) repeat-x;"></div>
 	<div style="font-size: 1.2em; width: 60%; text-align: center; padding: 0.5em">
-	A warm restart is required in order to complete a scheduling operation.
+	A restart is required in order to complete a scheduling operation.
 	<br>
 	<font class=blood>
 }

var/mongoose/include/sched.jim

@@ -125,14 +125,24 @@ foreach event $events {
 		puts "</a>"
 	}
 	puts "</td>"
+	if {[$event get aulEventToRecordInfo] != ""} {
+		puts "<td>*</td>"
+	}
 	puts "</tr>"
 }
 puts "</table>"
 puts "<font class=footnote>Click on the CRID to view episodes.</font>"
 
 puts {
+	<small>
 	<button onclick="window.location='/backup.shtml';">
-		Backup/Restore Scheduled Recordings/Events.
+		Backup/Restore Scheduled Recordings/Events
 	</button>
+	<button onclick="window.location='/cgi-bin/db.jim?db=rsv.db&tab=TBL_RESERVATION';">
+		Raw database view
+	</button>
+	<script type=text/javascript>
+		$('button').button();
+	</script>
 }
 

var/mongoose/include/transmission.jim

@@ -0,0 +1,21 @@
+#!/mod/bin/jimsh
+
+if {![file exists /mod/sbin/transmission-daemon]} { exit 0 }
+
+set url "/cgi-bin/transmission.jim"
+
+puts "
+<div style=\"float: left; padding-top: 5em\">
+	<center>
+	<a href=$url>
+	<img border=0 src=/img/transmission.png>
+	</a>
+	<br>
+	<a href=$url>
+	<b>Transmission</b>
+	</a>
+	<br>
+	</center>
+</div>
+"
+

var/mongoose/lib/epg.class

@@ -2,9 +2,8 @@ source /mod/var/mongoose/lib/setup
 
 if {![exists -proc class ]} { package require oo }
 if {![exists -proc sqlite3.open ]} { package require sqlite3 }
-if {![exists -proc settings ]} { require settings.class }
 
-require progressbar
+require settings.class progressbar rsv.class
 
 set ::channeldb 0
 catch { set ::channeldb [sqlite3.open /var/lib/humaxtv/channel.db] }
@@ -15,6 +14,8 @@ if {![file exists $::epgpath] && [file exists $::hdepgpath]} {
 	set ::epgpath $::hdepgpath
 }
 
+set ::rsvlookup [rsv lookuptab]
+
 #  * service_id, event_id, start, duration, encrypted, name, text
 #  * warning, content code, content type,
 #  * event CRID, series CRID, rec CRID
@@ -37,6 +38,10 @@ class epg {
 	channel_num	0
 	channel_name	""
 	channel_crid	""
+	channel_hsvc	0
+
+	sched_type	0
+	rsv		0
 }
 
 epg method _parse {line} {
@@ -82,7 +87,7 @@ epg method remaining {} {
 
 epg method type_icon {} {
 	set img ""
-	switch -- [$self get content_code] {
+	switch -- $content_code {
 		1 { set img "Movie" }
 		2 { set img "News" }
 		3 { set img "Show" }
@@ -110,7 +115,7 @@ proc {epg channelicon} {name {width 0} {style ""}} {
 }
 
 epg method channel_icon {{width 0} {style ""}} {
-	set str "<img src=\"/img/channels/[$self get channel_name].png\"";
+	set str "<img src=\"/img/channels/$channel_name.png\"";
 	if {$width > 0} { append str " width=$width" }
 	if {$style ne ""} { append str " style=\"$style\" }
 	append str " alt=\"\">"
@@ -122,13 +127,28 @@ epg method get_channel_info {} {
 
 	if {!$channel_num && $channeldb != ""} {
 		set chan [lindex [$channeldb query {
-			select szSvcName, usLcn, aucDefaultAuthority
+			select szSvcName, usLcn, aucDefaultAuthority, hsvc
 			from TBL_SVC
-			where usSvcId = %s} "[$self get service_id]"
+			where usSvcId = %s} $service_id
 		    ] 0]
-		set channel_num $chan(usLcn)
-		set channel_name [string range $chan(szSvcName) 1 end]
-		set channel_crid [string toupper $chan(aucDefaultAuthority)]
+		if {[dict exists $chan usLcn]} {
+			set channel_num $chan(usLcn)
+			set channel_name [string range $chan(szSvcName) 1 end]
+			set channel_crid [string toupper $chan(aucDefaultAuthority)]
+			set channel_hsvc $chan(hSvc)
+		}
+	}
+}
+
+epg method get_rsv {} {
+	if {$hsvc == 0} { $self get_channel_info }
+	if {$hsvc == 0} { return }
+
+	if {$rsv == 0 && $event_crid ne ""} {
+		set rsv [rsv entry $event_crid $hsvc]
+	}
+	if {$rsv == 0 && $series_crid ne ""} {
+		set rsv [rsv entry $series_crid $hsvc]
 	}
 }
 
@@ -138,40 +158,59 @@ epg method icon_set {{height 0}} {
 	set set ""
 	if {$icon != ""} {
 		lappend set "<img src=$icon $height
-		    alt=\"[$self get content_type]\"
-		    title=\"[$self get content_type]\">"
+		    alt=\"$content_type\" title=\"$content_type\">"
 	}
-	if {[$self get rec_crid] != ""} {
+
+	set sched_type 0
+	if {$event_crid ne "" && "$channel_hsvc$event_crid" in $::rsvlookup} {
+		set sched_type 1
 		lappend set \
-		    "<img src=/images/178_1_26_Icon_Recommend.png $height>"
+		    "<img src=/images/175_1_11_Reservation_Record.png $height>"
+	} elseif {$series_crid ne "" &&
+	    "$channel_hsvc$series_crid" in $::rsvlookup} {
+		set sched_type 2
 	}
-	if {[$self get series_crid] != ""} {
+
+	if {$sched_type == 2} {
+		lappend set \
+		    "<img src=/images/175_1_11_Series_Record.png $height>"
+	} elseif {$series_crid ne ""} {
 		lappend set \
 		    "<img src=/images/178_1_00_Icon_Serise.png $height>"
 	}
+
+	if {$rec_crid ne ""} {
+		lappend set \
+		    "<img src=/images/178_1_26_Icon_Recommend.png $height>"
+	}
+
 	return $set
 }
 
 epg method cell {} {
-	set name [$self get name]
-	set text [$self get text]
-	
 	set percent [$self percent]
 
 	puts "<td nowrap valign=top title=\"$text\">"
 
 	puts [join [$self icon_set 14] ""]
 
+	if {$series_crid ne ""} {
+		set recopts 2
+	} else {
+		set recopts 1
+	}
+
 	puts "
-	    <a class=event href=# xs=[$self get service_id]
-		xe=[$self get event_id]>
-	    $name</a>"
+	    <a class=event href=# xs=$service_id xe=$event_id
+		sch=$sched_type rec=$recopts>
+	    $name</a>
+	"
 
 	puts "<br>"
 
 	puts "<font class=footnote>"
-	puts "[clock format [$self get start] -format %H:%M]"
-	puts " ([clock format [$self get duration] -format %T])"
+	puts "[clock format $start -format %H:%M]"
+	puts " ([clock format $duration -format %T])"
 	if {$percent > 0 && $percent < 100} {
 		puts "<br>[progressbar $percent]"
 		puts "$percent% [clock format [$self elapsed] -format %T] /
@@ -182,8 +221,8 @@ epg method cell {} {
 }
 
 epg method next {} {
-	set tm [expr [$self get start] + [$self get duration] + 60]
-	set nextlist [epg fetch dump -service [$self get service_id] -time $tm]
+	set tm $($start + $duration + 60)
+	set nextlist [epg fetch dump -service $service_id -time $tm]
 
 	if {[llength nextlist] > 0} {
 		return [lindex $nextlist 0]
@@ -194,9 +233,9 @@ epg method next {} {
 
 epg method recommended {} {
 	set rec ""
-	if {[$self get rec_crid] != ""} {
+	if {$rec_crid ne ""} {
 		catch { set rec [lindex [
-		    epg fetch dump -crid [$self get rec_crid]] 0] }
+		    epg fetch dump -crid $rec_crid] 0] }
 	}
 	return $rec
 }

var/mongoose/lib/epg_popup

@@ -2,23 +2,59 @@ puts {
 <div id=dialogue></div>
 <script type=text/javascript>
 	$(document).ready(function() {
+		function doschedule(type)
+		{
+			$('#epginfo_extra').load('/cgi-bin/epg_schedule.jim?' +
+			    'service=' +
+			    encodeURIComponent($('#dialogue').attr('xs')) +
+			    '&event=' +
+			    encodeURIComponent($('#dialogue').attr('xe')) +
+			    '&type=' + type, function() {
+				$('#restart_block')
+				    .load('/cgi-bin/restartblock.jim');
+			});
+			$(":button:contains('Record')").fadeOut('slow');
+		}
+	
+		var $buttons1 = {
+		    "Close" : function() {$(this).dialog('close');}
+		};
+		var $buttons2 = $.extend(
+		    {"Record Programme": function() { doschedule(1) }},
+		    $buttons1);
+		var $buttons3 = $.extend(
+		    {"Record Series": function() { doschedule(2) }},
+		    $buttons2);
+
 		var $dialog = $('#dialogue').dialog({
 			title: "Programme Details",
 			modal: false, autoOpen: false,
 			height: 500, width: 700,
 			show: 'scale', hide: 'fade',
 			draggable: true, resizable: true,
-			buttons: { "Close":
-			    function() {$(this).dialog('close');}},
+			buttons: $buttons1,
 			close: function(e,u) { $('#dialogue').empty().html(
 			    '<img src="/img/loading.gif" alt="loading">'); }
 		});
 		$('a.event').click(function(e) {
 			e.preventDefault();
+			var sch = $(this).attr('sch');
+			var rec = $(this).attr('rec');
+			if (sch != 0)
+				$dialog.dialog("option", "buttons", $buttons1);
+			else if (rec == 2)
+				$dialog.dialog("option", "buttons", $buttons3);
+			else if (rec == 1)
+				$dialog.dialog("option", "buttons", $buttons2);
+			else
+				$dialog.dialog("option", "buttons", $buttons1);
 			var url = '/cgi-bin/epg_info.jim?service=' +
 			    $(this).attr('xs') + '&event=' +
 			    $(this).attr('xe') + '&bare=1';
 			$('#dialogue').load(url);
+			$('#dialogue')
+			    .attr('xs', $(this).attr('xs'))
+			    .attr('xe', $(this).attr('xe'));
 			$dialog.dialog('open');
 		});
 	});

var/mongoose/lib/opkg

@@ -1,6 +1,6 @@
 #!/bin/sh
 
 # stderr is always unbuffered so use that...
-/bin/opkg "$@" 1>&2
+/bin/opkg "$@" 2>&1
 exit 0
 

var/mongoose/lib/pkg.class

@@ -3,25 +3,25 @@ if {[expr ! [exists -proc class ]]} { package require oo }
 
 class pkg {
 	name		""
+	latest		""
 	descr		""
 	installed	""
-	latest		""
-	install_time	0
 }
 
-pkg method _load {nm info} {
-	set name $nm
-	set latest [lindex $info 0]
-	set descr [lrange $info 1 end]
+set ::pkgmeta {}
 
-	foreach line [split [exec /bin/opkg status $name] "\n"] {
-		if {[string match {Version: *} $line]} {
-			set installed [string range $line 9 end]
-		}
-		if {[string match {Installed-Time: } $line]} {
-			set install_time [string range $line 16 end]
-		}
-	}
+pkg method _load {nm} {
+	set name $nm
+	set info [join [split [exec /bin/opkg list $nm] "\n"] " "]
+	regexp {^([^ ]+) - ([^ ]+) - (.*)$} $info full xname latest descr
+	set info [exec /bin/opkg list-installed $nm]
+	regexp {^([^ ]+) - ([^ ]+)$} $info full xname installed
+
+	return $self
+}
+
+proc {pkg load} {nm} {
+	return [[pkg] _load $nm]
 }
 
 pkg method is {what} {
@@ -38,28 +38,19 @@ pkg method is {what} {
 	return 0
 }
 
-proc {pkg load} {nm info} {
-	set e [pkg]
-	$e _load $nm $info
-	return $e
-}
-
 proc {pkg avail} {} {
+	set inst_pkgs [pkg inst]
 	set avail_pkgs {}
 	foreach pkg [split [exec /bin/opkg list] "\n"] {
-		if [regexp {^ } $pkg] {
-			append descr $pkg
-		} else {
-			if {[regexp {^([^ ]+) - ([^ ]+) - (.*)$} \
-			    $pkg full name ver descr] == 0} { continue }
-		}
-		set avail_pkgs($name) [concat $ver "$descr"]
-		#puts "Set: $name = ($ver, $descr)<br>"
+		if [regexp {^ } $pkg] { continue }
+		if {[regexp {^([^ ]+)} $pkg name] == 0} { continue }
+		if {$name ni $inst_pkgs} { lappend avail_pkgs $name }
+		#puts "New: $name<br>"
 	}
 	return $avail_pkgs
 }
 
-proc {pkg installed} {} {
+proc {pkg inst} {} {
 	# Build a list of installed packages - just the names
 	set inst_pkgs {}
 	foreach pkg [split [exec /bin/opkg list-installed] "\n"] {
@@ -70,15 +61,43 @@ proc {pkg installed} {} {
 	return $inst_pkgs
 }
 
-proc {pkg upgradable} {} {
+proc {pkg upgr} {} {
 	#webif - 0.5.3 - 0.5.7
 	set upgr_pkgs {}
 	foreach pkg [split [exec /bin/opkg list-upgradable] "\n"] {
-		if {[regexp {^([^ ]+) - ([^ ]+) - (.*)$} $pkg \
-		    dummy name oldver newver] == 0} { continue }
-		set upgr_pkgs($name) [concat $oldver $newver]
-		#puts "Set: $name = ($oldver, $newver)<br>"
+		if {[regexp {^([^ ]+)} $pkg name] == 0} { continue }
+		lappend upgr_pkgs $name
+		#puts "Upgr: $name<br>"
 	}
 	return $upgr_pkgs
 }
 
+proc {pkg loadmeta} {} {
+	if {[llength $::pkgmeta]} { return }
+	if {![file exists "/mod/var/pkg.meta"]} {
+		pkg fetchmeta
+	} else {
+		set meta [open "/mod/var/pkg.meta" r]
+		set ::pkgmeta [read $meta]
+		$meta close
+	}
+}
+
+proc {pkg fetchmeta} {} {
+	set f [socket stream hummypkg.org.uk:80]
+	$f puts -nonewline "GET /pkg.meta HTTP/1.1\r\n"
+	$f puts -nonewline "Host: hummypkg.org.uk\r\n"
+	$f puts -nonewline "\r\n"
+
+	set line [string trim [$f gets]]
+	while {[string length $line]} {
+		set line [string trim [$f gets]]
+	}
+	set ::pkgmeta [$f read]
+	$f close
+
+	set ff [open "/mod/var/pkg.meta" w]
+	puts $ff $::pkgmeta
+	$ff close
+}
+

var/mongoose/lib/rsv.class

@@ -6,13 +6,14 @@ if {![exists -proc settings ]} { require settings.class }
 
 set rsvdb [sqlite3.open /var/lib/humaxtv/rsv.db]
 $rsvdb query {attach database '/var/lib/humaxtv/channel.db' as channel}
+catch { $rsvdb query {.mode tcl} }
 
 class rsv {
-	ulslot			0
+	ulslot			-1
 	ersvtype		0
 	hsvc			0
 	nsttime			0
-	szsttime		0
+	szsttime		"00000000000000"
 	nduration		0
 	erepeat			0
 	usevtid			0
@@ -49,6 +50,7 @@ rsv method name {} {
 		    5 { set name "--- Wake-up ---" }
 		    6 { set name "--- Sleep ---" }
 		    7 { set name "--- Auto Update ---" }
+		    11 { set name "--- DSO Event? ---" }
 		    default { set name "--- Unknown event type $ersvtype ---" }
 		}
 	}
@@ -81,11 +83,23 @@ rsv method fix_hsvc {} {
 
 rsv method insert {} {
 	global rsvdb
-	if {!$ulslot} {
-		set slot [
-		    $rsvdb query {select max(ulslot) FROM TBL_RESERVATION}]
-		set slot [expr 1 + [lindex [lindex $slot 0] 1]]
-		set ulslot $slot
+
+	# Find a spare slot.
+	if {$ulslot < 0} {
+		set slots [lmap i [
+		    $rsvdb query {
+			select ulslot FROM TBL_RESERVATION
+			order by ulslot;
+		    }] {lindex $i 1}]
+
+		set max [lindex $i end]
+		for {set i 0} {$i < $max} {incr i} {
+			if {$i ni $slots} {
+				set ulslot $i
+				break
+			}
+		}
+		if {$ulslot == -1} { set ulslot $($max + 1) }
 	}
 
 	set fields [lsort [$self vars]]
@@ -97,7 +111,10 @@ rsv method insert {} {
 
 	set vals {}
 	foreach field $fields {
-		lappend vals "'[$self get $field]'"
+		# Escape any quotes embedded in the data.
+		regsub -all {'} [$self get $field] {''} f
+		lappend vals "'$f'"
+		#lappend vals "'[$self get $field]'"
 	}
 
 	set query "insert into TBL_RESERVATION("
@@ -110,8 +127,6 @@ rsv method insert {} {
 }
 
 proc {rsv list} {} {
-	catch { $::rsvdb query {.mode tcl} }
-	
 	set res [$::rsvdb query {
 		select tbl_reservation.*,
 		channel.TBL_SVC.szSvcName, channel.TBL_SVC.usLcn,
@@ -130,6 +145,39 @@ proc {rsv list} {} {
 	return $records
 }
 
+proc {rsv lookuptab} {} {
+	set res [$::rsvdb query {
+		select tbl_reservation.szCRID, channel.TBL_SVC.hSvc
+		from tbl_reservation left join channel.TBL_SVC
+		on main.TBL_RESERVATION.hSvc = channel.TBL_SVC.hSvc
+		where ersvtype <= 3
+	}]
+
+
+	set records {}
+	foreach rec $res {
+		lappend records "$rec(hSvc)/[file tail $rec(szCRID)]"
+	}
+
+	return $records
+}
+
+proc {rsv entry} {crid svc} {
+	set res [$::rsvdb query {
+		select tbl_reservation.*,
+		channel.TBL_SVC.szSvcName, channel.TBL_SVC.usLcn
+		from tbl_reservation
+		left join channel.TBL_SVC
+		on main.TBL_RESERVATION.hSvc = channel.TBL_SVC.hSvc
+		where szCRID like '%%%s' and tbl_reservation.hsvc = '%s'
+	} $crid $svc]
+
+	if {[llength $res] > 0} {
+		return [rsv new [lindex $res 0]]
+	}
+	return 0
+}
+
 proc {rsv cleanup} {} {
 	catch {$::rsvdb close}
 }

var/mongoose/lib/settings.class

@@ -2,12 +2,25 @@
 if {![exists -proc class ]} { package require oo }
 if {![exists -proc sqlite3.open ]} { package require sqlite3 }
 
-set settingsdb [sqlite3.open /mod/etc/webif.db]
+if {![file exists /mod/etc/webif.db]} {
+	set settingsdb [sqlite3.open /mod/etc/webif.db]
+	catch {
+		$settingsdb query {
+			CREATE TABLE settings(name text, nval int, tval text);
+		}
+		$settingsdb query {
+			CREATE UNIQUE INDEX key on settings(name);
+		}
+	}
+} else {
+	set settingsdb [sqlite3.open /mod/etc/webif.db]
+}
 
 class settings {
 	hostname	""
 	channel_group	0
 	smtp_server	""
+	pkgdev		0
 }
 
 settings method hostname {{name ""}} {
@@ -86,6 +99,10 @@ settings method channel_group {{group -1}} {
 	return [$self _nval_setting channel_group $group]
 }
 
+settings method pkgdev {{val -1}} {
+	return [$self _nval_setting pkgdev $val]
+}
+
 settings method channel_groups {} {
 	set ret ""
 	set db [sqlite3.open /var/lib/humaxtv/setup.db]