update for new channel icons

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

CONTROL/control

@@ -1,9 +1,9 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 0.13.2
+Version: 1.0.4
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
-Depends: webif-channelicons(>=1.0.4-1),mongoose(>=3.0-7),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73-1),jim-cgi(>=0.7),jim-binary,service-control(>=1.2),busybox(>=1.20.2-1),lsof,epg(>=1.0.10),hmt(>=1.1.13),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.1.2),smartmontools,tmenu(>=1.05)
-Suggests: ffmpeg
+Depends: webif-channelicons(>=1.1.0),mongoose(>=3.0-9),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73-1),jim-cgi(>=0.7),jim-binary,service-control(>=1.2),busybox(>=1.20.2-1),lsof,epg(>=1.0.13),hmt(>=1.1.14),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.2.1),smartmontools,tmenu(>=1.05),ffmpeg,id3v2
+Suggests:
 Description: An evolving web interface for the Humax.

CONTROL/postinst

@@ -6,24 +6,22 @@ export tmpf=/tmp/cronf.$$
 
 # Add cron jobs
 
-crond=$PKG_ROOT/var/spool/cron/crontabs
-[ -d $crond ] || exit 1
-
-cronf=$crond/root
-grep -v webif/lib/bin/auto $cronf > $tmpf
-(
-	cat $tmpf
-	echo '*/10 * * * * /mod/webif/lib/bin/auto >/dev/null 2>&1'
-) > $cronf
+crontab=$PKG_ROOT/bin/crontab
+if [ -x $crontab ]; then
+	$crontab -l | grep -v webif/lib/bin/auto > $tmpf
+	cat $tmpf - << EOM | $crontab -
+*/10 * * * * /mod/webif/lib/bin/auto >/dev/null 2>&1
+EOM
+fi
 
 # Add anacron jobs
 
 ana=$PKG_ROOT/etc/anacrontab
-grep -v 'backup/backup.jim' $ana > $tmpf
-(
-	cat $tmpf
-	echo "1 8 sched_backup /mod/var/mongoose/cgi-bin/backup/backup.jim"
-) > $ana
+egrep -v 'backup/backup.jim|bin/diskattrs' $ana > $tmpf
+cat $tmpf - << EOM > $ana
+1 8 sched_backup /mod/webif/cgi-bin/backup/backup.jim
+1 5 diskattrs /mod/webif/lib/bin/diskattrs
+EOM
 
 $PKG_ROOT/etc/init.d/S02anacron start < /dev/null > /dev/null 2>&1 &
 
@@ -38,5 +36,9 @@ if [ ! -f /mod/webif/.strip-updated ]; then
 	touch /mod/webif/.strip-updated
 fi
 
+/mod/webif/lib/bin/diskattrs
+
+[ -f $tmpf ] && rm -f $tmpf
+
 exit 0
 

CONTROL/prerm

@@ -2,16 +2,17 @@
 
 export tmpf=/tmp/cronf.$$
 
-cronf=$PKG_ROOT/var/spool/cron/crontabs/root
-if [ -f $cronf ]; then
-	grep -v webif/lib/bin/auto $cronf > $tmpf
-	cp $tmpf $cronf
-	[ -s $cronf ] || rm -f $cronf
+crontab=$PKG_ROOT/bin/crontab
+if [ -x $crontab ]; then
+	$crontab -l | grep -v webif/lib/bin/auto > $tmpf
+	[ -s $tmpf ] && $crontab $tmpf || $crontab -r
 fi
 
 ana=/mod/etc/anacrontab
-grep -v 'backup/backup.jim' $ana > $tmpf
+egrep -v 'backup/backup.jim|bin/diskattrs' $ana > $tmpf
 cp $tmpf $ana
 
+[ -f $tmpf ] && rm -f $tmpf
+
 exit 0
 

var/mongoose/cgi-bin/channel.jim

@@ -67,7 +67,7 @@ foreach tw [$db query {
 			"BBC ONE" { set mux "PSB1/BBC A" }
 			"ITV1" { set mux "PSB2/D3&4" }
 			"ITV" { set mux "PSB2/D3&4" }
-			"BBC One HD" { set mux "PSB3/BBC B (HD)" }
+			"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" }

var/mongoose/cgi-bin/db.jim

@@ -6,6 +6,7 @@ source /mod/webif/lib/setup
 require altrow
 
 set databases [glob /var/lib/humaxtv/*.db]
+lappend databases {*}[glob /mod/etc/*.db]
 lappend databases "/mnt/hd2/dms_cds.db"
 
 header

var/mongoose/cgi-bin/settings.jim

@@ -7,7 +7,8 @@ require settings.class plugin system.class
 httpheader
 
 if {[cgi_get act] eq "https"} {
-	if {[cgi_get val off] eq "off"} {
+	set val [cgi_get val off]
+	if {$val in {0 off}} {
 		file delete /mod/etc/mongoose.cert
 		puts "HTTPS Server will be disabled after next reboot."
 	} else {
@@ -18,7 +19,8 @@ if {[cgi_get act] eq "https"} {
 }
 
 if {[cgi_get act] eq "xtelnet"} {
-	if {[cgi_get val off] eq "off"} {
+	set val [cgi_get val off]
+	if {$val in {0 off}} {
 		file delete /mod/boot/xtelnet
 		puts "Telnet server expert mode will be disabled after next reboot."
 	} else {
@@ -37,9 +39,11 @@ set epg_style [$settings epg_style]
 set pkgdev [$settings pkgdev]
 set notoolbar [$settings notoolbar]
 set nomobile [$settings nomobile]
+set nohelplinks [$settings nohelplinks]
 set xepghours [$settings xepghours]
 if {$xepghours == 0} { set xepghours 4 }
 set genrededup [$settings genrededup]
+set autolog [$settings autolog]
 
 # Handle updates
 
@@ -79,7 +83,9 @@ handle_str_update epg_style $epg_style "EPG Type"
 handle_int_update pkgdev $pkgdev "Development Package Display"
 handle_int_update notoolbar $notoolbar "Disable toolbar"
 handle_int_update nomobile $nomobile "Disable mobile link"
+handle_int_update nohelplinks $nohelplinks "Disable help links"
 handle_int_update genrededup $genrededup "Genre search dedup"
+handle_int_update autolog $autolog "Auto-processing log level"
 
 set acluser [cgi_get acluser "-"]
 set aclpass [cgi_get aclpass "-"]
@@ -120,6 +126,22 @@ puts {
 <link href=/css/iphone-style-checkboxes.css rel=stylesheet type=text/css />
 }
 
+proc setting_toggle {name attr checked {invert 0} {val 0}} {
+	puts -nonewline "
+	    <tr>
+		<th class=key>$name</th>
+		<td><input class=setting_toggle type=checkbox value=yes"
+	if {$checked} { puts -nonewline " checked" }
+	puts -nonewline " attr=$attr"
+	if {$invert} { puts -nonewline " invert=1" }
+	if {$val} { puts -nonewline " useval=1" }
+	puts -nonewline ">
+		<div id=${attr}_output></div>
+		</td>
+	</tr>
+	"
+}
+
 puts "
 	<fieldset style=\"display: inline\">
 		<legend>
@@ -144,36 +166,36 @@ puts "
 	</tr>
 "
 
-puts -nonewline "
-	<tr>
-		<th class=key>HTTPS web server?</th>
-		<td><input id=https_toggle name=https type=checkbox value=yes"
-if {[file exists /mod/etc/mongoose.cert]} { puts -nonewline " checked" }
-puts ">
-		    <div id=https_output></div>
-		</td>
-	</tr>
-"
+setting_toggle "HTTPS web server?" "https" \
+    [file exists /mod/etc/mongoose.cert] 0 1
+setting_toggle "Slide-down toolbar?" "notoolbar" $(!$notoolbar) 1
+setting_toggle "Mobile link on main page?" "nomobile" $(!$nomobile) 1
+setting_toggle "Help links on main page?" "nohelplinks" $(!$nohelplinks) 1
 
 puts -nonewline "
 	<tr>
-		<th class=key>Slide-down toolbar?</th>
-		<td><input id=toolbar_toggle name=toolbar type=checkbox value=yes"
-if {$notoolbar == 0} { puts -nonewline " checked" }
-puts ">
-		    <div id=toolbar_output></div>
-		</td>
-	</tr>
+	<form class=auto id=autolog method=get action=$env(REQUEST_URI)>
+		<th class=key>Auto-processing log level</th>
+		<td><select id=autolog name=autolog
+		    class=\"text ui-widget-content ui-corner-all\">
 "
-
-puts -nonewline "
-	<tr>
-		<th class=key>Mobile link on main page?</th>
-		<td><input id=mobile_toggle name=mobile type=checkbox value=yes"
-if {$nomobile == 0} { puts -nonewline " checked" }
-puts ">
-		    <div id=mobile_output></div>
+puts "<option value=0"
+if {$autolog == 0} { puts " selected" }
+puts ">Actions and errors only\n"
+puts "<option value=1"
+if {$autolog == 1} { puts " selected" }
+puts ">Actions, errors and scan information\n"
+puts "<option value=2"
+if {$autolog == 1} { puts " selected" }
+puts ">Debugging information\n"
+puts "
+		</select>
+		<small>
+		<input name=autolog value=\"set\" type=submit>
+		</small>
+		<div id=autolog_output></div>
 		</td>
+	</form>
 	</tr>
 "
 
@@ -268,49 +290,43 @@ puts "
 	</tr>
 "
 
-puts -nonewline "
-	<tr>
-		<th class=key>De-duplicate genre search results?</th>
-		<td><input id=genrededup_toggle name=genrededup type=checkbox value=yes"
-if {$genrededup == 1} { puts -nonewline " checked" }
-puts ">
-		    <div id=genrededup_output></div>
-		</td>
-	</tr>
-"
+setting_toggle "De-duplicate genre search results?" genrededup $genrededup
 
 puts "
 	</table>
 	</fieldset>
 	<br><br>
-	<fieldset style=\"display: inline\">
-	<legend> Email Settings </legend>
-	<table>
 "
 
-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 "
+#	<fieldset style=\"display: inline\">
+#	<legend> Email Settings </legend>
+#	<table>
+#"
+#
+#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>
+#"
 
 puts "
-	</table>
-	</fieldset>
-"
-
-puts "
-	<br><br>
 	<fieldset style=\"display: inline\">
 	<legend> Web Interface User Access Control </legend>
 	<table>
@@ -405,34 +421,16 @@ puts -nonewline "
 	<fieldset style=\"display: inline\">
 	<legend> Advanced Settings </legend>
 	<table>
-	<tr>
-		<th class=key>Show development and advanced packages?</th>
-		<td><input name=pkgdev id=pkgdev value=1 type=checkbox
-"
-if {$pkgdev} { puts -nonewline " checked" }
-puts ">
-		</td>
-	</tr>
 "
+setting_toggle "Show development and advanced packages?" "pkgdev" $pkgdev
 
 if {[system modversion 1] >= 214} {
-
-puts -nonewline "
-	<tr>
-		<th class=key>Expert mode telnet server?</th>
-		<td><input id=xtelnet_toggle name=xtelnet type=checkbox value=yes"
-if {[file exists /mod/boot/xtelnet]} { puts -nonewline " checked" }
-puts ">
-		    <div id=xtelnet_output></div>
-		</td>
-	</tr>
-"
-
+	setting_toggle "Expert mode telnet server?" "xtelnet" \
+	    [file exists /mod/boot/xtelnet] 0 1
 }
 
 puts "
 	</table>
-	<div id=pkgdev_output></div>
 	</fieldset>
 "
 

var/mongoose/cgi-bin/settings.js

@@ -41,117 +41,33 @@ $(document).ready(function () {
 		});
 	});
 
-	$('#pkgdev').change(function() {
+	$('.setting_toggle').change(function() {
 		var arg = '0';
+		var urlargs;
 		if ($(this).attr('checked'))
 			arg = '1';
 
-		$(this).disable();
+		if ($(this).attr('invert'))
+			arg = arg == "0" ? "1" : "0";
 
-		$('#pkgdev_output')
-		    .empty()
-		    .show('slow')
-		    .load('/cgi-bin/settings.jim?pkgdev=' + arg,
-		        function() {
-				$('#pkgdev').enable();
-				$('#pkgdev_output')
-				    .css('font-style', 'italic')
-				    .delay(2000).fadeOut('slow');
-		    });
-	});
+		var el = $(this);
+		var attr = $(this).attr('attr');
+		var output = '#' + attr + '_output';
 
-	$('#https_toggle').change(function() {
-		var arg = 'off';
-		if ($(this).attr('checked'))
-			arg = 'on';
+		if ($(this).attr('useval'))
+			urlargs = 'act=' + attr + '&val=' + arg;
+		else
+			urlargs = attr + '=' + arg;
 
 		$(this).disable();
 
-		$('#https_output')
-		    .empty()
-		    .html('<img src=/img/loading.gif>Please Wait...')
-		    .show('slow')
-		    .load('/cgi-bin/settings.jim?act=https&val=' + arg,
-		        function() {
-				$('#https_toggle').enable();
-				$('#https_output')
-				    .css('font-style', 'italic')
-				    .delay(2000).fadeOut('slow');
-		    });
-	});
-
-	$('#xtelnet_toggle').change(function() {
-		var arg = 'off';
-		if ($(this).attr('checked'))
-			arg = 'on';
-
-		$(this).disable();
-
-		$('#xtelnet_output')
-		    .empty()
-		    .html('<img src=/img/loading.gif>Please Wait...')
-		    .show('slow')
-		    .load('/cgi-bin/settings.jim?act=xtelnet&val=' + arg,
-		        function() {
-				$('#xtelnet_toggle').enable();
-				$('#xtelnet_output')
-				    .css('font-style', 'italic')
-				    .delay(2000).fadeOut('slow');
-		    });
-	});
-
-	$('#toolbar_toggle').change(function() {
-		var arg = '1';
-		if ($(this).attr('checked'))
-			arg = '0';
-
-		$(this).disable();
-
-		$('#toolbar_output')
+		$(output)
 		    .empty()
 		    .show('slow')
-		    .load('/cgi-bin/settings.jim?notoolbar=' + arg,
+		    .load('/cgi-bin/settings.jim?' + urlargs,
 		        function() {
-				$('#toolbar_toggle').enable();
-				$('#toolbar_output')
-				    .css('font-style', 'italic')
-				    .delay(2000).fadeOut('slow');
-		    });
-	});
-
-	$('#mobile_toggle').change(function() {
-		var arg = '1';
-		if ($(this).attr('checked'))
-			arg = '0';
-
-		$(this).disable();
-
-		$('#mobile_output')
-		    .empty()
-		    .show('slow')
-		    .load('/cgi-bin/settings.jim?nomobile=' + arg,
-		        function() {
-				$('#mobile_toggle').enable();
-				$('#mobile_output')
-				    .css('font-style', 'italic')
-				    .delay(2000).fadeOut('slow');
-		    });
-	});
-
-	$('#genrededup_toggle').change(function() {
-		var arg = '0';
-		if ($(this).attr('checked'))
-			arg = '1';
-
-		$(this).disable();
-
-		$('#genrededup_output')
-		    .empty()
-		    .show('slow')
-		    .load('/cgi-bin/settings.jim?genrededup=' + arg,
-		        function() {
-				$('#genrededup_toggle').enable();
-				$('#genrededup_output')
+				$(el).enable();
+				$(output)
 				    .css('font-style', 'italic')
 				    .delay(2000).fadeOut('slow');
 		    });

var/mongoose/cgi-bin/xepg.jim

@@ -123,7 +123,7 @@ foreach e $records {
 
 		puts "[$e channel_icon 30] "
 		puts "$chnum
-	    <a href=/cgi-bin/epg/service.jim?service=[$e get service_id]
+	    <a href=\"/cgi-bin/epg/service.jim?service=[$e get service_id]\"
 		title=\"[$e get channel_name]\">
 	    [$e get channel_name]
 	    </a></div>"
@@ -173,7 +173,10 @@ foreach e $records {
 	    clock format $ee -format "%H:%M"])"
 	if {$showing} { append hxt " ($perc%)" }
 
-	puts "<div class=\"xeprog $bg\"
+	set lbg $bg
+	if {[$e scheduled]} { set lbg "blueshade" }
+
+	puts "<div class=\"xeprog $lbg\"
 	    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]
@@ -221,7 +224,7 @@ puts "
         onSelect: function(val, sel) {
                 var stt = \$(this).attr('stt');
                 // Extract date part
-                dval  = ~~(val / 86400000);
+                dval  = Math.round(val / 86400000.0);
                 // Extract current time part
                 var tm = ~~(stt % 86400);
 

var/mongoose/html/browse/assets.jim

@@ -21,10 +21,14 @@ if {$model eq "HDR"} {
 }
 if {[system pkginst ffmpeg]} {
 	puts {
-		<li><a href=#audio>Extract Audio</a></li>
-		<li><a href=#mpg>Extract to MPG</a></li>
+		<li class=mp3><a href=#audio>Extract Audio</a></li>
+		<li class=mpg><a href=#mpg>Extract to MPG</a></li>
+		<li class=thm><a href=#thm>Set Thumbnail</a></li>
 	}
 }
+
+puts { <li><a href=#vthm>View Thumbnail</a></li> }
+
 if $nicesplice {
 	puts {
 		<li class="cut"><a href=#crop>Crop</a></li>
@@ -77,7 +81,16 @@ if $flatten {
 
 puts {
 	<li class=clock><a href=#expire>Auto-Expire</a></li>
-	<li class=mpg><a href=#mpg>Auto-MPG Extract</a></li>
+}
+
+if {[system pkginst ffmpeg]} {
+	puts {
+		<li class=mp3><a href=#mp3>Auto-Audio Extract</a></li>
+		<li class=mpg><a href=#mpg>Auto-MPG Extract</a></li>
+	}
+}
+
+puts {
 </ul>
 
 <div id=renameform title="Rename media file" style="display: none">
@@ -255,7 +268,7 @@ puts {
 		</label>
 	</th>
 	<td>
-		<input type=text name="aexpiry_days" id="aexpiry_days"
+		<input name="aexpiry_days" id="aexpiry_days"
 		    type=number value=0 size=5 maxlength=3
 		    class="text ui-widget-content ui-corner-all">
 	</td>
@@ -278,5 +291,9 @@ Please wait...
 </center>
 </div>
 
+<div id=bmpdialogue title="Recording Thumbnail" class=hidden>
+<img id=thmbmp class=doublebmp src="about:blank">
+</div>
+
 }
 

var/mongoose/html/browse/bmp.jim

@@ -0,0 +1,19 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+require cat
+
+set file [cgi_get file]
+set file "[file rootname $file].thm"
+
+if {![file exists $file]} {
+	httpheader "text/plain"
+	puts "No such file, $file"
+	exit
+}
+
+httpheader "image/bmp"
+cat "/mod/webif/lib/bmpheader"
+cat $file
+

var/mongoose/html/browse/decrypt/decrypt.jim

@@ -11,7 +11,7 @@ set rfile [cgi_get file]
 set ts [ts fetch $rfile]
 set dir [file dirname $rfile]
 set len [$ts duration 1]
-lassign [$ts dlnaloc] url
+lassign [$ts dlnaloc "127.0.0.1"] url
 
 puts "
 <link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />

var/mongoose/html/browse/decrypt/execute.jim

@@ -11,7 +11,7 @@ set rfile [cgi_get file]
 set ts [ts fetch $rfile]
 set dir [file dirname $rfile]
 set len [$ts duration 1]
-lassign [$ts dlnaloc] url
+lassign [$ts dlnaloc "127.0.0.1"] url
 
 if {$url eq ""} {
 	puts "This file has not been indexed by the media server.

var/mongoose/html/browse/file.jim

@@ -23,7 +23,12 @@ if {$type eq "ts"} {
 <table class=keyval>
 <tr>
 	<th>Title</th>
-	<td>[$ts get title]</td>
+	<td class=va>
+	"
+	if {[file exists "[file rootname $file].thm"]} {
+		puts "<img class=\"bmp va\" width=70 height=39 src=\"bmp.jim?file=$file\">"
+	}
+	puts "[$ts get title]</td>
 </tr><tr>
 	<th>Synopsis</th>
 	<td>[$ts get synopsis]</td>

var/mongoose/html/browse/index.jim

@@ -77,13 +77,19 @@ proc directory {file bfile tbfile} {
 	puts "</div>"
 }
 
+set dircount 0
+set filecount 0
+
 proc entry {file} {{i 0}} {
+	global dircount filecount
+	
 	set bfile [file tail $file]
 	regsub -all " +" $bfile "" tbfile
 	if {[string index $bfile 0] == "\025"} {
 		set bfile [string range $bfile 1 end]
 	}
 	if [file isdirectory "$file"] {
+		incr dircount
 		directory $file $bfile $tbfile
 		return
 	}
@@ -96,11 +102,13 @@ proc entry {file} {{i 0}} {
 
 	set base [file rootname $file]
 
+	set thmok 0
 	if {$ext eq ".ts" && [file exists "${base}.nts"]} {
 		set type ts
 		set ts [ts fetch $file 1]
 		set img Video_TS
 		set omenu opt
+		if {[file exists "${base}.thm"]} { set thmok 1 }
 	} elseif {$ext eq ".hmt"} {
 		if {[file exists "${base}.ts"]} { continue }
 		# Sole hmt file indicates failure to track.
@@ -114,6 +122,7 @@ proc entry {file} {{i 0}} {
 		set img Video_Other
 		set omenu oopt
 	}
+	incr filecount
 
 	set new 0
 	if {$type eq "ts"} {
@@ -221,7 +230,7 @@ proc entry {file} {{i 0}} {
 		<img class=\"$omenu va\" border=0 width=45 type=$type did=$i
 		    locked=$locked encd=$encd def=$def new=$new bx=$bx
 		    shrunk=$shrunk rsize=$rsz
-		    odencd=$odencd dlna=$dlna
+		    odencd=$odencd dlna=$dlna thmok=$thmok
 		    src=/images/181_1_00_Help5_OPT_Plus.png>
 	      </a>
 	    <div class=\"results blood\" style=\"margin: 0 0 0 5em\"></div>
@@ -259,7 +268,7 @@ 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 "<a href=\"$env(REQUEST_URI)?dir=[cgi_quote_url $stub]\">$name</a>
 }
 puts "<span class=filesize id=dirsize></span>"
 puts "</legend>"
@@ -269,7 +278,7 @@ 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]>
+		<a href=\"$env(REQUEST_URI)?dir=[cgi_quote_url $parent]\">
 		<img border=0 src=/images/711_3_09_Media_Folder_UP.png class=va>
 			\[parent directory\]</a>
 	    </div>
@@ -306,12 +315,16 @@ proc s_time {a b} {
 set files [readdir -nocomplain $dir]
 switch $order {
 	1 {		set files [lsort -command s_time $files] }
-	default {	set files [lsort $files] }
+	default {	set files [lsort -nocase $files] }
 }
 
 foreach file $files { entry "$dir/$file" }
 
-puts "<a href=# id=selectall>Select all</a> | <a href=# id=deselectall>none</a>"
+puts "
+<a href=# id=selectall>Select all</a> | <a href=# id=deselectall>none</a>
+&nbsp;&nbsp;
+Directories: $dircount, Files: $filecount
+"
 
 # Sort icons
 puts "<div id=sortdiv>"
@@ -324,7 +337,7 @@ foreach sl $sortlist {
 	set tag "Currently sorting"
 	if {$order != $index} {
 		puts "
-		    <a href=$env(REQUEST_URI)?$env(QUERY_STRING)&order=$index>"
+	    <a href=\"$env(REQUEST_URI)?$env(QUERY_STRING)&order=$index\">"
 		set tag "Sort"
 	}
 	puts "<img class=va border=0 src=/img/$img.gif> $tag by $descr"

var/mongoose/html/browse/resetnew.jim

@@ -1,45 +1,12 @@
 #!/mod/bin/jimsh
 
 package require cgi
-package require pack
 source /mod/webif/lib/setup
-require ts.class hexdump
+require ts.class
 
 httpheader
 
 set dir [cgi_get dir]
-if {![file isdirectory $dir]} { exit }
-if {![file exists "$dir/.series"]} { exit }
 
-set tot 0
-set watched 0
-foreach file [readdir -nocomplain $dir] {
-	if {![string match {*.ts} $file]} { continue }
-	#puts "FILE: $file"
-	incr tot
-	if {[set ts [ts fetch "$dir/$file"]] != 0} {
-		if {![$ts flag "New"]} { incr watched }
-	}
-}
-
-set fd [open "$dir/.series"]
-set bytes [read $fd]
-close $fd
-set recs [unpack $bytes -uintle 0 32]
-set played [unpack $bytes -uintle 32 32]
-
-puts "Current: $played/$recs"
-
-#hexdump $bytes
-
-puts "Calculated: $watched/$tot"
-
-pack bytes $tot -intle 32 0 
-pack bytes $watched -intle 32 32
-
-#hexdump $bytes
-
-set fd [open "$dir/.series" "w"]
-puts -nonewline $fd $bytes
-close $fd
+ts resetnew $dir
 

var/mongoose/html/browse/script.js

@@ -178,6 +178,20 @@ function new_callback(file, type, id)
 	$.get(url, function() { window.location.reload(true); });
 }
 
+function thumbnail_callback(file, type, id)
+{
+	var el = 'div.bf#' + id;
+	var results = el + ' .results';
+	$(results)
+	    .html('<img src=/img/loading.gif>Generating thumbnail, ' +
+		'please wait...')
+	    .slideDown('slow')
+	    .load('/browse/thumbnail.jim?file=' + file)
+	    .delay(3000)
+	    .slideUp('slow');
+	$('div.bf#' + id + ' img.opt').attr('thmok', 1);
+}
+
 function rename_submit()
 {
 	var s = $('#renameform_form').serialize();
@@ -257,6 +271,16 @@ function preparemenu(el, menu)
 		else
 			$(menu).disableContextMenuItems('#crop');
 
+		if (el.attr('odencd') == 0)
+			$(menu).enableContextMenuItems('#thm');
+		else
+			$(menu).disableContextMenuItems('#thm');
+
+		if (el.attr('thmok') == 1)
+			$(menu).enableContextMenuItems('#vthm');
+		else
+			$(menu).disableContextMenuItems('#vthm');
+
 		$(menu).enableContextMenuItems('#strip');
 
 		if (el.attr('rsize') > 4294967296)
@@ -358,6 +382,7 @@ function preparedmenu(el, menu)
 	fixdmenu(el, menu, 'autodedup', '#dedup', 'Auto-dedup', 0);
 	fixdmenu(el, menu, 'autodecrypt', '#decrypt', 'Auto-decrypt', 1);
 	fixdmenu(el, menu, 'autompg', '#mpg', 'Auto-mpg', 0);
+	fixdmenu(el, menu, 'automp3', '#mp3', 'Auto-audio', 0);
 	fixdmenu(el, menu, 'autoexpire', '#expire', 'Auto-expire', 0);
 }
 
@@ -423,6 +448,19 @@ var menuclick = function(action, el, pos)
 		$('#renameform').dialog('open');
 		break;
 
+	    case 'thm':
+		window.location.href = '/browse/thumbnail/index.jim?file=' +
+		    file;
+		break;
+
+	    case 'vthm':
+//		window.open('/browse/bmpw.jim?file=' + file, 'hxwebifbmp',
+//		    'height=156,width=280,toolbar=no,' +
+//		    'scrollbars=no,menubar=no,location=no,titlebar=no');
+		$('#thmbmp').attr('src', 'bmp.jim?file=' + file);
+		$('#bmpdialogue').dialog('open');
+		break;
+
 	    case 'download':
 		window.location.href = '/browse/download.jim?file=' +
 		    file + '&base=' +
@@ -569,6 +607,10 @@ var dmenuclick = function(action, el, pos)
 		flagdir(file, 'autompg', iconset, results, el);
 		break;
 
+	    case 'mp3':
+		flagdir(file, 'automp3', iconset, results, el);
+		break;
+
 	    case 'shrink':
 		flagdir(file, 'autoshrink', iconset, results, el);
 		break;
@@ -743,6 +785,18 @@ var dmenuclick = function(action, el, pos)
 		close: function() { $('#savestream_name').val(''); }
 	});
 
+	$('#bmpdialogue').dialog({
+		autoOpen: false,
+		height: 'auto', width: 'auto',
+		modal: true,
+		buttons: {
+			"Close": function() {
+				$(this).dialog('close');
+			}
+		},
+		close: function() { $('#thmbmp').attr('src', 'about:blank'); }
+	});
+
 	// Create re-usable confirmation dialogue.
 	$confirm = $('#confirm').dialog({
 		modal: true, autoOpen: false,

var/mongoose/html/browse/thumbnail/_mk.jim

@@ -0,0 +1,19 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+require ts.class cat
+
+httpheader "image/bmp"
+
+set rfile [cgi_get file]
+set pos [cgi_get pos 0]
+
+if {![catch {set ts [ts fetch $rfile]}]} {
+	$ts mkbmp $pos ".pos$pos"
+
+	set f "[file rootname $rfile].pos$pos.bmp"
+	cat $f
+	file delete $f
+}
+

var/mongoose/html/browse/thumbnail/fetch.jim

@@ -0,0 +1,17 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+require cat
+
+httpheader "image/bmp"
+
+set rfile [cgi_get file]
+set pos [cgi_get pos 0]
+
+set f "[file rootname $rfile].pos$pos.bmp"
+if {[file exists $f]} {
+	cat $f
+	file delete $f
+}
+

var/mongoose/html/browse/thumbnail/index.jim

@@ -0,0 +1,98 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+require ts.class pretty_size
+
+header
+
+set rfile [cgi_get file]
+set ts [ts fetch $rfile]
+set dir [file dirname $rfile]
+
+set len [$ts duration 1]
+
+lassign [$ts bookmarks] book
+if {$book eq ""} { set book 0 }
+
+set pos [cgi_get pos $book]
+set pos $($pos + 0)
+if {$pos < 0} { set pos 0 }
+
+puts "
+<script type=text/javascript src=script.js></script>
+<script type=text/javascript src=/js/enadis.js></script>
+
+<fieldset class=cleft>
+<legend>Replace Thumbnail</legend>
+
+<table class=keyval cellpadding=5>
+<tr><th>File:</th><td>
+	<span class=hidden id=dir>[file dirname $rfile]</span>
+	<span id=file>$rfile</span>
+</td></tr>
+<tr><th>Length:</th><td>[clock format $len -format %T]</td></tr>
+<tr><th>Size:</th><td>[pretty_size [$ts size]] ([$ts get definition])</td></tr>
+<tr><th>Bookmarks:</th><td>[$ts get bookmarks] ($book second(s))</td></tr>
+<tr><th>Thumbnail:</th><td>
+    <img class=doublebmp src=\"../bmp.jim?file=[cgi_quote_url $rfile]\">
+</td></tr>
+</table>
+"
+
+if {[$ts get definition] eq "HD"} {
+	set start $($pos - 0.5)
+	set incr 1.0
+} else {
+	set start $($pos - 1)
+	set incr 2.0
+}
+if {$start < 0} { set start 0 }
+set limit $($start + $incr)
+
+puts "<div style=\"width=100%; text-align: center\">
+    <button id=back>Back to media browser</button>
+    <br /> <br />
+    <form method=get action=index.jim>
+	    <input type=hidden name=file value=\"$rfile\">
+	    Thumbnails from around
+	    <input name=pos id=pos size=5 maxlength=4 value=\"$pos\">
+	    second(s) into recording.
+    </form>
+    <button class=mvpos pos=[expr $pos - 30]>&lt;&lt; 30 seconds</button>
+    <button class=mvpos pos=[expr $pos - 5]>&lt; 5 seconds</button>
+    <button id=repos>Update</button>
+    <button class=mvpos pos=[expr $pos + 5]>&gt; 5 seconds</button>
+    <button class=mvpos pos=[expr $pos + 30]>&gt;&gt; 30 seconds</button>
+</div>
+<span id=start class=hidden>$start</span>
+<span id=end class=hidden>$limit</span>
+<table class=keyval cellpadding=5>
+<tr>
+"
+
+for {set i [expr $start + 0.0]} {$i <= $limit} {set i [expr $i + 0.5]} {
+	lappend times $i
+	puts "<th style=\"text-align: center\">
+	    @ <span class=mark>$i</span>s</th>"
+}
+puts "</tr><tr>"
+
+foreach i $times {
+	puts "<td>
+	    <img class=bmp src=/img/generating.png pos=$i>
+	    </td>"
+}
+
+puts "</tr><tr>"
+
+foreach i $times {
+	puts "<td style=\"text-align: center\">
+	    <button class=usethm pos=\"$i\">Use</button>
+	    </td>"
+}
+
+puts "</tr>"
+
+puts "</table>"
+

var/mongoose/html/browse/thumbnail/mkrange.jim

@@ -0,0 +1,21 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+require ts.class
+
+httpheader
+
+set rfile [cgi_get file]
+set s [cgi_get s 0]
+set e [cgi_get e $($s + 2)]
+set i [expr [cgi_get i 0.5] + 0.0]
+
+if {![catch {set ts [ts fetch $rfile]}]} {
+	$ts cleanbmp
+	for {set n [expr $s + 0.0]} {$n <= $e} {set n [expr $n + $i]} {
+		puts "Generating thumbnail for pos $n"
+		$ts mkbmp $n ".pos$n"
+	}
+}
+

var/mongoose/html/browse/thumbnail/script.js

@@ -0,0 +1,58 @@
+
+$(document).ready(function() {
+
+var dir = $('#dir').text();
+var file = $('#file').text();
+
+$('button').button();
+
+function go(pos)
+{
+	window.location.href = 'index.jim?file=' +
+	    encodeURIComponent(file) + '&pos=' + pos;
+}
+
+$('button.mvpos').disable().on('click', function(e) {
+	e.preventDefault();
+	var pos = $(this).attr('pos');
+	go(pos);
+});
+
+$('#repos').disable().on('click', function(e) {
+	e.preventDefault();
+	var pos = $('#pos').val();
+	go(pos);
+});
+
+$('#back').on('click', function(e) {
+	e.preventDefault();
+	window.location.href = '/browse/index.jim?dir=' +
+	    encodeURIComponent(dir);
+});
+
+$('button.usethm').disable().on('click', function(e) {
+	e.preventDefault();
+	var pos = $(this).attr('pos');
+	$('button,input').disable();
+	$.get('set.jim?file=' + encodeURIComponent(file) + '&pos=' + pos,
+	    function() {
+		window.location.href = '/browse/index.jim?dir=' +
+		    encodeURIComponent(dir);
+	});;
+});
+
+var start = $('#start').text();
+var end = $('#end').text();
+$.get('mkrange.jim?file=' + encodeURIComponent(file) +
+    '&s=' + start + '&e=' + end, function() {
+	$('img.bmp').each(function(i) {
+		var pos = $(this).attr('pos');
+		$(this).attr('src',
+		    'fetch.jim?file=' + encodeURIComponent(file) +
+		    '&pos=' + pos);
+	});
+	$('button').enable();
+});
+
+});
+

var/mongoose/html/browse/thumbnail/set.jim

@@ -0,0 +1,15 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+require ts.class
+
+httpheader
+
+set file [cgi_get file]
+set pos [cgi_get pos 0]
+
+if {![catch {set ts [ts fetch $file]}]} {
+	$ts mkthm $pos
+}
+

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

@@ -70,6 +70,8 @@
 .contextMenu LI.decrypt A { background-image: url(/img/context/decrypt.png); }
 .contextMenu LI.decryptr A { background-image: url(/img/context/decryptr.png); }
 .contextMenu LI.mpg A { background-image: url(/img/context/mpg.png); }
+.contextMenu LI.mp3 A { background-image: url(/img/context/mp3.png); }
 .contextMenu LI.clock A { background-image: url(/img/context/clock.png); }
+.contextMenu LI.thm A { background-image: url(/img/context/thumb.png); }
 
 

var/mongoose/html/css/style.css

@@ -65,13 +65,33 @@ div.footer
 	padding-top: 2em;
 }
 
-div.warningbox
+div.owarningbox
 {
 	background: url('/img/redshade.png') repeat-x;
 	padding: 0.5em;
 	margin: 1em;
 }
 
+div.warningbox
+{
+	width: 60%;
+	background: url('/img/redshade.png') repeat-x;
+	background-size: 100%;
+	#color: #005000;
+	border: 1px solid #7a4707;
+	padding: 10px;
+	position: relative;
+	top: -2px;
+	left: -2px;
+	font-weight: bold;
+	z-index: 30;
+	box-shadow: 2px 2px 11px #666;
+	-moz-box-shadow: 2px 2px 11px #666;
+	-webkit-box-shadow: 2px 2px 11px #666;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+}
+
 table
 {
 	empty-cells: show;
@@ -410,3 +430,18 @@ div#restart_block
 	z-index: 31;
 }
 
+img.bmp, img.doublebmp
+{
+	transform: scaleY(-1);
+	-webkit-transform: scaleY(-1);
+	-o-transform: scaleY(-1);
+	height: 78px;
+	width: 140px;
+}
+
+img.doublebmp
+{
+	height: 156px;
+	width: 280px;
+}
+

var/mongoose/html/dedup/dedup.jim

@@ -26,6 +26,7 @@ puts "<fieldset style=\"display: inline\">
 "
 
 loadseries $dir
+set recalc 0
 foreach file [readdir $dir] {
 	set file "$dir/$file"
 	if {[file extension $file] ne ".hmt"} { continue }
@@ -52,6 +53,7 @@ foreach file [readdir $dir] {
 			}
 			ts renamegroup $file "_duplicates/$fn"
 			puts -nonewline " - Renamed to _duplicates/$fn"
+			incr recalc
 		}
 	    }
 	    error {
@@ -78,6 +80,8 @@ foreach file [readdir $dir] {
 	puts "</tr>"
 }
 
+if {$recalc} { ts resetnew $dir }
+
 puts {
 </table>
 </fieldset>

var/mongoose/html/diag/clearlog.jim

@@ -9,10 +9,12 @@ set logdirs {/var/log /mod/tmp /mnt/hd3}
 set logext {.log}
 
 set log [cgi_get file 0]
+set unlink [cgi_get unlink 0]
 
 set ldir [file dirname $log]
 if {[file dirname $log] in $logdirs && [file extension $log] in $logext} {
 	file copy -force "/dev/null" $log
+	if {$unlink} { file delete $log }
 	puts "Cleared $log"
 	exit
 }

var/mongoose/html/diag/disk.jim

@@ -2,12 +2,12 @@
 
 package require cgi
 source /mod/webif/lib/setup
-require system.class
+require system.class settings.class
 
 header
 
-set space [system diskspace]
-set device [string range [lindex $space 5] 0 end-1]
+set device [system disk]
+set settings [settings]
 
 set smart Unknown
 set line ""
@@ -16,9 +16,11 @@ catch { set line [exec /mod/bin/smartctl -H $device | sed -n 5p] } msg
 if {$msg ne "" && $line eq ""} { set line $msg }
 if {$line ne ""} {
 	set smart [string range [lindex [split $line :] 1] 1 end]
+	$settings _tval_setting "SMART_status" $smart
 }
 
 puts "
+<script type=text/javascript src=/js/enadis.js></script>
 <h3 class=va>
 	<img class=va width=100 src=/img/disc.png>
 	SMART data read from device $device
@@ -99,9 +101,22 @@ foreach line [split [exec /mod/bin/smartctl -A $device] "\n"] {
 	    id name flags val worst thresh type updated when rval
 	set class normal
 	switch $id {
-		5 { if {$rval > 0} { set class orangeshade } }
-		197 { if {$rval > 0} { set class redshade } }
-		198 { if {$rval > 0} { set class redshade } }
+		5 {
+			$settings _nval_setting "SMART_realloc" $rval
+			if {$rval > 0} { set class orangeshade }
+		}
+		10 {
+			$settings _nval_setting "SMART_spinretry" $rval
+			if {$rval > 0} { set class orangeshade }
+		}
+		197 {
+			$settings _nval_setting "SMART_pending" $rval
+			if {$rval > 0} { set class redshade }
+		}
+		198 {
+			$settings _nval_setting "SMART_offline" $rval
+			if {$rval > 0} { set class redshade }
+		}
 	}
 	puts "<tr class=$class>"
 	puts "
@@ -144,6 +159,7 @@ foreach line [split $msg "\n"] {
 	regsub -all -- {[[:space:]][[:space:]]+} $line "|" line
 	if {[incr i] < 7} continue
 	lassign [split $line "|"] id name status remaining when lba
+	if {[string length $id] > 10} continue
 	puts "<tr>
 		<td>$id</td>
 		<td>$name</td>
@@ -157,6 +173,28 @@ foreach line [split $msg "\n"] {
 puts {
 </table>
 </fieldset>
+
+
+<div class=cleft style="padding-top: 2em">
+<button id=diskack>Acknowledge any current disk faults.</button>
+</div>
+
+<script type=text/javascript>
+$(function() {
+
+$('#diskack')
+	.button()
+	.on('click', function(e) {
+		e.preventDefault();
+		$('button').disable();
+		$.get('diskack.jim', function() {
+			window.location.reload(true);
+		});
+	});
+});
+
+</script>
+
 }
 
 footer

var/mongoose/html/diag/diskack.jim

@@ -0,0 +1,16 @@
+#!/mod/bin/jimsh
+
+source /mod/webif/lib/setup
+require settings.class
+
+httpheader
+
+set settings [settings]
+
+foreach attr {realloc pending offline} {
+	set val [$settings _nval_setting "SMART_$attr"]
+	if {$val <= 0} continue
+	$settings _nval_setting "SMART_ack_$attr" $val
+}
+
+

var/mongoose/html/edit/edit.jim

@@ -23,7 +23,8 @@ puts {
 Use the <i>Open</i> button below to begin.
 </div>
 
-<textarea cols=80 rows=20 id=editor></textarea>
+<textarea cols=80 rows=20 id=editor
+class="ui-widget ui-corner-all"></textarea>
 
 <br>
 <button class=xeditactive id=open>Open</button>

var/mongoose/html/favicon.ico

@@ -0,0 +1 @@
+img/fav/favicon.ico

var/mongoose/html/img/fav/notes.txt

@@ -0,0 +1,6 @@
+<link rel="icon" href="/favicon.ico" sizes="16x16 32x32 64x64" type=image/vnd.microsoft.icon />
+<link rel="apple-touch-icon" href="/img/fav/57.png" />
+<link rel="apple-touch-icon" sizes="57x57" href="/img/fav/57.png" />
+<link rel="apple-touch-icon" sizes="72x72" href="/img/fav/72.png" />
+<link rel="apple-touch-icon" sizes="114x114" href="/img/fav/114.png" />
+<link rel="apple-touch-icon" sizes="144x144" href="/img/fav/144.png" />

var/mongoose/html/img/mp3.png

@@ -0,0 +1 @@
+context/mp3.png

var/mongoose/html/index.shtml

@@ -19,7 +19,6 @@ $(document).ready(function() {
 </script>
 
 <!--#exec cmd="/mod/webif/include/menuicons.jim" -->
-<!--#exec cmd="/mod/webif/include/menuplugins.jim" -->
 </div>
 
 <div class=footer>

var/mongoose/html/js/jquery.contextMenu.js

@@ -14,8 +14,8 @@
 //
 // For details, visit http://creativecommons.org/licenses/by/3.0/us/
 
-// Modified by Andy Fiddaman to support left click and
-// support modification of menu items.
+// Modified by af123 to support left click, modification of menu items and
+// utilise jQuery.ui.position for smart element positioning.
 
 if (jQuery) (function() {
     $.extend($.fn, {
@@ -53,31 +53,17 @@ if (jQuery) (function() {
 
 			    if (o.beforeShow) o.beforeShow(el, menu);
 
-                            // Detect mouse position
-                            var d = {}, x, y;
-                            if (self.innerHeight) {
-                                d.pageYOffset = self.pageYOffset;
-                                d.pageXOffset = self.pageXOffset;
-                                d.innerHeight = self.innerHeight;
-                                d.innerWidth = self.innerWidth;
-                            } else if (document.documentElement &&
-								document.documentElement.clientHeight) {
-                                d.pageYOffset = document.documentElement.scrollTop;
-                                d.pageXOffset = document.documentElement.scrollLeft;
-                                d.innerHeight = document.documentElement.clientHeight;
-                                d.innerWidth = document.documentElement.clientWidth;
-                            } else if (document.body) {
-                                d.pageYOffset = document.body.scrollTop;
-                                d.pageXOffset = document.body.scrollLeft;
-                                d.innerHeight = document.body.clientHeight;
-                                d.innerWidth = document.body.clientWidth;
-                            }
-                            (e.pageX) ? x = e.pageX : x = e.clientX + d.scrollLeft;
-                            (e.pageY) ? y = e.pageY : x = e.clientY + d.scrollTop;
-
                             // Show the menu
                             $(document).unbind('click');
-                            $(menu).css({ top: y, left: x }).fadeIn(o.inSpeed);
+//                            $(menu).css({ top: y, left: x }).fadeIn(o.inSpeed);
+			$(menu).css('display', 'block').position({
+			    my: "left top",
+			    at: "right bottom",
+			    of: this,
+			    offset: "0 5",
+			    collision: "fit"
+			}).css('display', 'none').fadeIn(o.inSpeed);
+
                             // Hover events
                             $(menu).find('A').mouseover(function() {
                                 $(menu).find('LI.hover').removeClass('hover');
@@ -120,7 +106,8 @@ if (jQuery) (function() {
                                 $(document).unbind('click').unbind('keypress');
                                 $(".contextMenu").hide();
                                 // Callback
-                                if (callback) callback($(this).attr('href').substr(1), $(srcElement), { x: x - offset.left, y: y - offset.top, docX: x, docY: y });
+                                //if (callback) callback($(this).attr('href').substr(1), $(srcElement), { x: x - offset.left, y: y - offset.top, docX: x, docY: y });
+                                if (callback) callback($(this).attr('href').substr(1), $(srcElement));
                                 return false;
                             });
 

var/mongoose/html/lib/header.jim

@@ -11,7 +11,13 @@ source /mod/webif/include/model.jim
 puts {
 </title>
 <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE9" />
-<link rel="shortcut icon" href=/img/favicon.ico />
+<link rel="icon" href="/favicon.ico" sizes="16x16 32x32 64x64"
+    type="image/vnd.microsoft.icon" />
+<link rel="apple-touch-icon" href="/img/fav/57.png" />
+<link rel="apple-touch-icon" sizes="57x57" href="/img/fav/57.png" />
+<link rel="apple-touch-icon" sizes="72x72" href="/img/fav/72.png" />
+<link rel="apple-touch-icon" sizes="114x114" href="/img/fav/114.png" />
+<link rel="apple-touch-icon" sizes="144x144" href="/img/fav/144.png" />
 <link type="text/css" href="/lib/jquery.ui/css/custom-theme/jquery-ui.css"
     rel="Stylesheet" />     
 <link href="/css/style.css" rel="Stylesheet" type="text/css" />
@@ -25,6 +31,8 @@ source /mod/webif/html/lib/topbar.jim
 puts "<div id=restart_block>"
 source /mod/webif/include/restart.jim
 puts "</div>"
+source /mod/webif/include/diskcheck.jim
+source /mod/webif/include/notify.jim
 
 puts {
 <div style="clear: both">

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

@@ -0,0 +1,21 @@
+
+.context-menu-item.icon-pwedit { background-image: url(/img/context/page_white_edit.png); }
+.context-menu-item.icon-pwcopy { background-image: url(/img/context/page_white_copy.png); }
+.context-menu-item.icon-pwpaste { background-image: url(/img/context/page_white_paste.png); }
+.context-menu-item.icon-pwdelete { background-image: url(/img/context/page_white_delete.png); }
+.context-menu-item.icon-edit { background-image: url(/img/context/edit.png); }
+.context-menu-item.icon-copy { background-image: url(/img/context/copy.png); }
+.context-menu-item.icon-paste { background-image: url(/img/context/paste.png); }
+.context-menu-item.icon-delete { background-image: url(/img/context/delete.png); }
+.context-menu-item.icon-cut { background-image: url(/img/context/cut.png); }
+.context-menu-item.icon-quit { background-image: url(/img/context/door.png); }
+.context-menu-item.icon-compress { background-image: url(/img/context/compress.png); }
+.context-menu-item.icon-compressr { background-image: url(/img/context/compressr.png); }
+.context-menu-item.icon-dedup { background-image: url(/img/context/dedup.png); }
+.context-menu-item.icon-decrypt { background-image: url(/img/context/decrypt.png); }
+.context-menu-item.icon-decryptr { background-image: url(/img/context/decryptr.png); }
+.context-menu-item.icon-mpg { background-image: url(/img/context/mpg.png); }
+.context-menu-item.icon-mp3 { background-image: url(/img/context/mp3.png); }
+.context-menu-item.icon-clock { background-image: url(/img/context/clock.png); }
+.context-menu-item.icon-thm { background-image: url(/img/context/thumb.png); }
+

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

@@ -0,0 +1,142 @@
+/*!
+ * jQuery contextMenu - Plugin for simple contextMenu handling
+ *
+ * Version: git-master
+ *
+ * Authors: Rodney Rehm, Addy Osmani (patches for FF)
+ * Web: http://medialize.github.com/jQuery-contextMenu/
+ *
+ * Licensed under
+ *   MIT License http://www.opensource.org/licenses/mit-license
+ *   GPL v3 http://opensource.org/licenses/GPL-3.0
+ *
+ */
+
+.context-menu-list {
+    margin:0; 
+    padding:0;
+    
+    min-width: 120px;
+    max-width: 250px;
+    display: inline-block;
+    position: absolute;
+    list-style-type: none;
+    
+    border: 1px solid #DDD;
+    background: #EEE;
+    
+    -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
+       -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
+        -ms-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
+         -o-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
+            box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
+    
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 11px;
+}
+
+.context-menu-item {
+    padding: 2px 2px 2px 24px;
+    background-color: #EEE;
+    position: relative;
+    -webkit-user-select: none;
+       -moz-user-select: -moz-none;
+        -ms-user-select: none;
+            user-select: none;
+}
+
+.context-menu-separator {
+    padding-bottom:0;
+    border-bottom: 1px solid #DDD;
+}
+
+.context-menu-item > label > input,
+.context-menu-item > label > textarea {
+    -webkit-user-select: text;
+       -moz-user-select: text;
+        -ms-user-select: text;
+            user-select: text;
+}
+
+.context-menu-item.hover {
+    cursor: pointer;
+    background-color: #39F;
+}
+
+.context-menu-item.disabled {
+    color: #666;
+}
+
+.context-menu-input.hover,
+.context-menu-item.disabled.hover {
+    cursor: default;
+    background-color: #EEE;
+}
+
+.context-menu-submenu:after {
+    content: ">";
+    color: #666;
+    position: absolute;
+    top: 0;
+    right: 3px;
+    z-index: 1;
+}
+
+/* icons
+    #protip:
+    In case you want to use sprites for icons (which I would suggest you do) have a look at
+    http://css-tricks.com/13224-pseudo-spriting/ to get an idea of how to implement 
+    .context-menu-item.icon:before {}
+ */
+.context-menu-item.icon { min-height: 18px; background-repeat: no-repeat; background-position: 4px 2px; }
+.context-menu-item.icon-edit { background-image: url(images/page_white_edit.png); }
+.context-menu-item.icon-cut { background-image: url(images/cut.png); }
+.context-menu-item.icon-copy { background-image: url(images/page_white_copy.png); }
+.context-menu-item.icon-paste { background-image: url(images/page_white_paste.png); }
+.context-menu-item.icon-delete { background-image: url(images/page_white_delete.png); }
+.context-menu-item.icon-add { background-image: url(images/page_white_add.png); }
+.context-menu-item.icon-quit { background-image: url(images/door.png); }
+
+/* vertically align inside labels */
+.context-menu-input > label > * { vertical-align: top; }
+
+/* position checkboxes and radios as icons */
+.context-menu-input > label > input[type="checkbox"],
+.context-menu-input > label > input[type="radio"] {
+    margin-left: -17px;
+}
+.context-menu-input > label > span {
+    margin-left: 5px;
+}
+
+.context-menu-input > label,
+.context-menu-input > label > input[type="text"],
+.context-menu-input > label > textarea,
+.context-menu-input > label > select {
+    display: block;
+    width: 100%;
+    
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
+         -o-box-sizing: border-box;
+            box-sizing: border-box;
+}
+
+.context-menu-input > label > textarea {
+    height: 100px;
+}
+.context-menu-item > .context-menu-list {
+    display: none;
+    /* re-positioned by js */
+    right: -5px;
+    top: 5px;
+}
+
+.context-menu-item.hover > .context-menu-list {
+    display: block;
+}
+
+.context-menu-accesskey {
+    text-decoration: underline;
+}

var/mongoose/html/pkg/index.shtml

@@ -42,15 +42,15 @@
 <div id=pkgtabs>
 <ul>
 	<li>
-		<a class=tablink href=pkg.jim?type=inst>
+		<a class=tablink href="pkg.jim?type=inst">
 		<span>Installed</span>
 		</a>
 	</li><li>
-		<a class=tablink href=pkg.jim?type=avail>
+		<a class=tablink href="pkg.jim?type=avail">
 		<span>Available</span>
 		</a>
 	</li><li>
-		<a class=tablink href=pkg.jim?type=upgr>
+		<a class=tablink href="pkg.jim?type=upgr">
 		<span>Upgrades</span>
 		</a>
 	</li>

var/mongoose/html/sched/script.js

@@ -147,8 +147,7 @@ function preparemenu(el, menu)
 	else
 		$('#optmenu').disableContextMenuItems('#ar');
 
-	if ($(el).attr('table') != 'pending' && (
-	    $(el).attr('reckind') == 4 || $(el).attr('reckind') == 1))
+	if ($(el).attr('table') != 'pending' && $(el).attr('reckind') == 4)
 		$('#optmenu').enableContextMenuItems('#folder');
 	else
 		$('#optmenu').disableContextMenuItems('#folder');

var/mongoose/include/backup.jim

@@ -8,12 +8,13 @@ puts {
 <h2>Backup/Restore</h2>
 
 <div id=restore_warning class="hidden warningbox">
+<div>
 <center>
 <b>!!!!!!!!!!!!!! PLEASE NOTE !!!!!!!!!!!!!!
 <br><br>
 After restoring the scheduled recordings you <b>MUST</b> restart the box using
 the link at the top of the screen or via the remote control.
-</div>
+</div></div>
 
 <div style="clear: both; float: left; width: 40%; border: 1px solid grey;
     padding: 1em">

var/mongoose/include/diskcheck.jim

@@ -0,0 +1,78 @@
+#!/mod/bin/jimsh
+
+source /mod/webif/lib/setup
+require system.class
+
+if {[system model] eq "HDR"} {
+
+require settings.class
+
+set smartattrs {realloc pending offline spinretry}
+
+set smartattribs(SMART_status) "Unknown"
+foreach sa $smartattrs {
+	set smartattribs(SMART_$sa) 0
+	set smartattribs(SMART_ack_$sa) 0
+}
+
+foreach line [[settings] smartdata] {
+	lassign $line x name x n x t
+	if {$name eq "SMART_status"} {
+		set smartattribs($name) $t
+	} else {
+		set smartattribs($name) $n
+	}
+}
+
+# (SMART_ack_status 0 SMART_ack_pending 0 SMART_status PASSED SMART_pending 7 SMART_ack_realloc 0 SMART_ack_offline 0 SMART_realloc 0 SMART_offline 7)
+
+set smartmsg ""
+if {$smartattribs(SMART_status) ne "PASSED"} {
+	append smartmsg \
+	    "Disk overall health assessment is: $smartattribs(SMART_status)\n"
+}
+
+foreach sa $smartattrs {
+	if {$smartattribs(SMART_$sa) != $smartattribs(SMART_ack_$sa)} {
+		append smartmsg \
+		    "Disk $sa sector count is: $smartattribs(SMART_$sa)"
+		if {$smartattribs(SMART_ack_$sa) > 0} {
+			append smartmsg " (was $smartattribs(SMART_ack_$sa))"
+		}
+		append smartmsg "\n"
+	}
+}
+
+if {$smartmsg ne ""} {
+	if {![dict exists $env REQUEST_URI]} { set env(REQUEST_URI) "" }
+	puts "
+<div id=smartwarning class=warningbox><center>
+!! WARNING !!
+<br><br>
+There appear to be some hardware problems with the internal hard disk on
+this device.
+<br><br>
+[string map {"\n" "<br>"} $smartmsg]
+	"
+	if {$env(REQUEST_URI) ne "/diag/disk.jim"} {
+		puts "
+			<br>
+			<a href=/diag/disk.jim>Go to disk diagnostics</a>
+		"
+	} else {
+		puts "
+			<br>
+			Don't panic; for help, visit
+			<a target=_blank
+			    href=http://wiki.hummy.tv/wiki/Disk_Problem>
+				wiki.hummy.tv
+			</a>
+		"
+	}
+	puts "
+</center></div>
+	"
+}
+
+}
+

var/mongoose/include/diskspace.jim

@@ -4,7 +4,9 @@ source /mod/webif/lib/setup
 require system.class
 
 lassign [system diskspace] size used perc free fperc
-set file [format "%02d" [expr {$perc * 25 / 100 + 1}]]
+set dsindex $($perc * 25 / 100 + 1)
+if {$dsindex > 25} { set dsindex 25 }
+set dsfile [format "%02d" $dsindex]
 
 # The HD model only has the USB images which are blue. I prefer the green
 # one so use those if available.
@@ -19,7 +21,7 @@ puts "
 	<span style=\"float: right; 
 	    background:url('/images/345_1_27_ST_USB_BG.png')
 	    no-repeat\">
-		<img src=/images/${prefix}_$file.png>
+		<img src=/images/${prefix}_$dsfile.png>
 	</span>
 
 	<span style=\"float: right\">

var/mongoose/include/epg.jim

@@ -57,7 +57,8 @@ foreach record $records {
 		puts "<td>$chnum</td>"
 		puts "<td>[$record channel_icon 50]</td>
 		    <td>
-	    <a href=/cgi-bin/epg/service.jim?service=[$record get service_id]>
+	    <a href=\"/cgi-bin/epg/service.jim?service=[\
+		$record get service_id]\">
 		    [$record get channel_name]
 		    </a></td>"
 		set lcn $chnum

var/mongoose/include/menuicons.jim

@@ -1,9 +1,13 @@
 #!/mod/bin/jimsh
 
 source /mod/webif/lib/setup
-require settings.class
+require system.class settings.class plugin
 
 proc menuitem {title icon link {width 217} {height 0} {extra ""}} {{num 0}} {
+	if {$title eq "-reset"} {
+		set num 0
+		return
+	}
 	incr num
 	if {$title eq ""} return
 	if {$num > 4} {
@@ -15,7 +19,8 @@ proc menuitem {title icon link {width 217} {height 0} {extra ""}} {{num 0}} {
 <div class=left num=$num>
 	<center>
 	<a href=$link>
-		<img src=$icon ${extra}border=0 width=$width"
+		<img src=$icon ${extra}border=0 "
+	if {$width} { puts -nonewline " width=$width" }
 	if {$height} { puts -nonewline " height=$height" }
 	puts -nonewline ">
 	</a>
@@ -29,7 +34,9 @@ proc menuitem {title icon link {width 217} {height 0} {extra ""}} {{num 0}} {
 "
 }
 
-if {[[settings] epg_style] eq "grid"} {
+set settings [settings]
+
+if {[$settings epg_style] eq "grid"} {
 	set epglink "/cgi-bin/xepg.jim"
 } else {
 	set epglink "/epg.shtml"
@@ -62,3 +69,25 @@ menuitem "Settings" "/images/326_1_00_Menu_Settings.png" \
 menuitem "Diagnostics" "/img/diagnostics.png" \
 	/diag/diag.jim 217 228
 
+eval_plugins menu
+
+if {[$settings nohelplinks] == 0} {
+
+menuitem "-reset" "" ""
+puts {</div><div style="clear: both; padding-top: 3em">}
+
+menuitem "hummy.tv<br>Forums" "/img/forum.png" \
+	"http://hummy.tv/ target=_blank" 0 100 \
+	"style=\"padding: 1em\""
+menuitem "hummy.tv<br>Wiki" "/img/wiki.png" \
+	"http://wiki.hummy.tv/ target=_blank" 0 100 \
+	"style=\"padding: 1em\""
+menuitem "Things Every<br>Owner Should Know" "/img/started.png" \
+	"http://hummy.tv/forum/threads/1858/ target=_blank" 0 100 \
+	"style=\"padding: 1em\""
+menuitem "Twitter<br>Feed" "/img/silver-twitter-bird-button.png" \
+	"http://twitter.com/HummyPkg target=_blank" 0 100 \
+	"style=\"padding: 1em\""
+
+}
+

var/mongoose/include/notify.jim

@@ -0,0 +1,30 @@
+#!/mod/bin/jimsh
+
+if {[file exists /mod/tmp/notify.log]} {
+
+source /mod/webif/lib/setup
+require cat
+
+puts "
+<div id=sysnotify class=warningbox><center>
+!! WARNING !!
+<br><br>
+You have pending system notifications:
+<br><br>
+<pre>
+"
+cat /mod/tmp/notify.log
+puts {
+</pre>
+<button id=sysnotify_ack>Acknowledge</button>
+</center></div>
+<script type=text/javascript>
+$('#sysnotify_ack').button().on('click', function() {
+	$('#sysnotify').slideUp('slow');
+	$.get('/diag/clearlog.jim?file=/mod/tmp/notify.log&unlink=1');
+});
+</script>
+}
+
+}
+

var/mongoose/lib/bin/auto

@@ -1,9 +1,10 @@
 #!/mod/bin/jimsh
 
 source /mod/webif/lib/setup
-require lock system.class ts.class tdelete pretty_size browse.class safe_delete
+require lock system.class ts.class tdelete pretty_size browse.class \
+    safe_delete settings.class plugin
 
-set debug 0
+set loglevel [[settings] autolog]
 
 if {![acquire_lock webif_auto]} {
 	puts "Cannot acquire exclusive lock, terminating."
@@ -18,8 +19,8 @@ if {[file exists $logfile] && [file size $logfile] > 2097152} {
 }
 
 set logfd [open "/mod/tmp/auto.log" "a+"]
-proc log {msg {always 0}} {
-	if {!$::debug && !$always} return
+proc log {msg {level 1}} {
+	if {$level > $::loglevel} return
 	puts $::logfd "[\
 	    clock format [clock seconds] -format "%d/%m/%Y %H:%M"\
 	    ] - $msg"
@@ -40,8 +41,39 @@ proc endclock {size} {
 	return "[pretty_size $size] in $el seconds - [pretty_size $rate]/s"
 }
 
+set modules {decrypt dedup shrink mpg mp3 expire}
+
+foreach mod $modules {
+	set "hook_pre${mod}scan" {}
+	set "hook_pre$mod" {}
+	set "hook_post$mod" {}
+	set "hook_post${mod}scan" {}
+}
+
+proc register {type fn} {
+	global "hook_$type"
+	if {[info exists "hook_$type"]} {
+		lappend "hook_$type" $fn
+		log "Registered $fn for $type hook." 1
+	} else {
+		log "Unknown hook hook_$type" 0
+	}
+}
+
+proc runplugin {name {ts 0}} {
+	set var "hook_$name"
+	global $var
+	foreach p [subst $$var] {
+		if {[catch {$p $ts} msg]} {
+			log "Plugin error: $msg" 0
+		}
+	}
+}
+
+eval_plugins auto
+
 set scanstart [clock milliseconds]
-log "-------------------------------------------------------" 1
+log "-------------------------------------------------------"
 
 # is_listening is relatively expensive so it is checked once globally at
 # the start and then if the server is not listening then no decrypt
@@ -51,13 +83,13 @@ log "-------------------------------------------------------" 1
 # of the run.
 if {[system is_listening 9000]} {
 	set dlnaok 1
-	if {$::debug} { log "DLNA Server is running." }
+	log "DLNA Server is running." 2
 } else {
 	set dlnaok 0
-	if {$::debug} { log "DLNA Server is NOT running." }
+	log "DLNA Server is NOT running." 2
 }
 
-log "Media scan starting, DLNA server status: $dlnaok" 1
+log "Media scan starting, DLNA server status: $dlnaok"
 
 proc dsc {{size 0}} {
 	set free [system diskfree]
@@ -66,7 +98,7 @@ proc dsc {{size 0}} {
 	set req $($size * 3 + 1073741824)
 
 	if {$free < $req} {
-		log "Insufficient disk space. Require=$req, Free=$free" 1
+		log "Insufficient disk space. Require=$req, Free=$free" 0
 		exit
 	}
 }
@@ -76,11 +108,11 @@ dsc
 set tmp "/mod/tmp/webif_auto"
 if {![file exists $tmp]} {
 	if {[catch {file mkdir $tmp} msg]} {
-		log "Cannot create temporary directory - $tmp ($msg)" 1
+		log "Cannot create temporary directory - $tmp ($msg)" 0
 		exit
 	}
 } elseif {![file isdirectory $tmp]} {
-	log "Cannot create temporary directory - $tmp (file exists)" 1
+	log "Cannot create temporary directory - $tmp (file exists)" 0
 	exit
 }
 
@@ -93,14 +125,23 @@ if {[system pkginst undelete]} {
 	set dustbin ""
 }
 
-log "Dustbin: $dustbin"
+log "Dustbin: $dustbin" 2
+
+set recalc 0
+
+proc dorecalc {dir} {
+	global recalc
+	if {!$recalc} return
+	ts resetnew $dir
+	set recalc 0
+}
 
 proc dedup {dir} {
-	log "DEDUP: \[$dir]"
+	log "DEDUP: \[$dir]" 2
 	loop i 0 1 {
 		foreach line [split \
 		    [exec /mod/webif/html/dedup/dedup -yes -auto $dir] "\n"] {
-			log $line 1
+			log $line 2
 		}
 	}
 }
@@ -111,39 +152,44 @@ proc do_expire {ts} {
 
 	# Calculate the age of the file in days.
 	set age $(([clock seconds] - [$ts get start]) / 86400.0)
-	log "  EXPIRE: $file (age = $age)"
+	log "  EXPIRE: $file (age = $age)" 2
 
 	if {$age > $ax_days} {
-		log "     EXPIRE: $file ($age > $ax_days)" 1
 		if {[$ts inuse]} {
-			log "          In use." 1
+			log "     EXPIRE: $file ($age > $ax_days)"
+			log "          In use."
 			return
 		}
+		runplugin preexpire $ts
 		if {[safe_delete $file]} {
-			log "          Deleted." 1
+			log "     EXPIRE: $file ($age > $ax_days)" 0
+			log "          Deleted." 0
+			runplugin postexpire $ts
+			incr ::recalc
 		}
 	}
 }
 
 proc do_shrink {ts} {
 	global tmp dustbin tsgroup
+	set file [$ts get file]
 
 	if {[$ts flag "Shrunk"]} {
-		log "          Already shrunk."
+		log "  $file - already shrunk." 2
 		return
 	}
 
 	set file [file rootname [$ts get file]]
 
 	if {[$ts inuse]} {
-		log "  $file - in use." 1
+		log "  $file - in use." 2
 		return
 	}
 
 	if {[catch {
 		set perc [exec /mod/bin/stripts -aq $file]
 	    } msg]} {
-		log "          Error: $msg" 1
+		log "          Error: $msg" 0
 		return
 	}
 	if {[string match {*%} $perc]} {
@@ -153,24 +199,26 @@ proc do_shrink {ts} {
 	}
 
 	if {$perc == 0} {
-		log "          Already shrunk."
+		log "  $file - already shrunk." 2
 		$ts set_shrunk
 		return
 	}
 	set size [$ts size]
 	dsc $size
+	runplugin preshrink $ts
 	startclock
-	log "  SHRINK: $file" 1
-	log "          Estimate $perc% saving." 1
-	log "          Shrinking..." 1
+	log "  SHRINK: $file" 0
+	log "          Estimate $perc% saving." 0
+	log "          Shrinking..." 0
 	if {[catch {
 		foreach line [split \
 		    [exec nice -n 19 /mod/bin/stripts -q $file $tmp/shrunk] \
 		    "\n"] {
-			log $line 1
+			log $line 0
 		}
 	    } msg]} {
-		log "Error during shrink: $msg" 1
+		log "Error during shrink: $msg" 0
+		system notify "$file - auto-shrink - error $msg."
 		return
 	}
 
@@ -196,7 +244,8 @@ proc do_shrink {ts} {
 		}
 	}
 	$ts set_shrunk
-	log "Done... [endclock $size]" 1
+	log "Done... [endclock $size]" 0
+	runplugin postshrink $ts
 }
 
 proc do_decrypt {ts} {
@@ -207,37 +256,73 @@ proc do_decrypt {ts} {
 	set bfile [file tail $file]
 
 	if {![$ts flag "ODEncrypted"]} {
-		log "          Already decrypted."
+		log "  $file - Already decrypted." 2
 		return
 	}
 
-	lassign [$ts dlnaloc] url
+	lassign [$ts dlnaloc "127.0.0.1"] url
 	if {$url eq ""} {
-		log "          Not yet indexed."
+		log "  $file - Not yet indexed."
 		return
 	}
 
 	if {![system is_listening 9000]} {
-		log "          DLNA Server not running."
+		log "  $file - DLNA Server not running." 2
 		set ::dlnaok 0
 		return
 	}
 
 	if {[$ts inuse]} {
-		log "          In use." 1
+		log "  $file - In use."
 		return
 	}
+
+	# Check that the file is not already decrypted by analysing it.
+	set anencd [exec /mod/bin/stripts -qE $rfile]
+	if {$anencd != "1"} {
+		log "  $file - already decrypted but the HMT flag is wrong." 0
+		system notify "$file - auto-decrypt - file is already decrypted but the HMT flag is wrong."
+		return
+	}
+
+	# Perform the decryption by requesting the file from the DLNA server.
 	set size [$ts size]
 	dsc $size
+	runplugin predecrypt $ts
 	set flagfile "$tmp/decrypting.$bfile"
 	exec /mod/bin/busybox/touch $flagfile
 	startclock
-	log "  DECRYPT: $rfile" 1
-	log "  DLNA: $url" 1
+	log "  DECRYPT: $rfile" 0
+	log "  DLNA: $url" 0
 	exec wget -O "$tmp/$bfile" $url
 
 	if {[file size $file] != [file size "$tmp/$bfile"]} {
-		log "        File size mismatch." 1
+		log "  $file - File size mismatch." 0
+		file delete "$tmp/$bfile"
+		file delete $flagfile
+		return
+	}
+
+	# Check if the file is in use. It is possible that the file is
+	# now being played even though it was free when decryption started.
+	if {[$ts inuse]} {
+		log "  $file - In use."
+		file delete "$tmp/$bfile"
+		file delete $flagfile
+		return
+	}
+
+	# Copy the HMT file over for stripts
+	set thmt "$tmp/[file rootname $bfile].hmt"
+	file copy "$rfile.hmt" $thmt
+	# Check that the file is no longer encrypted by analysing it.
+	set anencd [exec /mod/bin/stripts -qE "$tmp/[file rootname $bfile]"]
+	file delete $thmt
+
+	if {$anencd != "0"} {
+		log "  $file - File did not decrypt properly." 0
+		system notify "$file - auto-decrypt failed."
+		file delete "$tmp/$bfile"
 		file delete $flagfile
 		return
 	}
@@ -249,7 +334,7 @@ proc do_decrypt {ts} {
 	# Patch the HMT - quickest way to get back to a playable file.
 	exec /mod/bin/hmt -encrypted "$rfile.hmt"
 
-	log "  Removing/binning old copy."
+	log "  Removing/binning old copy." 0
 	# Move the old recording to the bin if undelete is installed.
 	if {$dustbin ne ""} {
 		set bin [_del_bindir $file "webif_autodecrypt"]
@@ -268,8 +353,9 @@ proc do_decrypt {ts} {
 	} else {
 		tdelete "$rfile.encrypted"
 	}
-	log "Done... [endclock $size]" 1
+	log "Done... [endclock $size]" 0
 	file delete $flagfile
+	runplugin postdecrypt $ts
 }
 
 proc do_mpg {ts} {
@@ -283,38 +369,98 @@ proc do_mpg {ts} {
 	}
 
 	if {[$ts flag "ODEncrypted"]} {
-		log "          Not decrypted."
+		log "  $file - Not decrypted." 2
 		return
 	}
 
 	if {[$ts get definition] eq "HD"} {
-		# Cannot extract a useful MP3 from a HD recording.
+		# Cannot extract a useful MPG from a HD recording.
 		return
 	}
 
 	if {[$ts inuse]} {
-		log "          In use." 1
+		log "  $file - In use."
 		return
 	}
+	runplugin prempg $ts
 	dsc [$ts size]
 
-	log "     MPG: $file" 1
-	log "          Converting..." 1
+	log "     MPG: $file" 0
+	log "          Converting..." 0
 	if {[catch {
 		foreach line [split \
 		    [exec nice -n 19 /mod/bin/ffmpeg -y -benchmark -v 0 \
 		    -i $file.ts \
 		    -map 0:0 -map 0:1 \
 		    -vcodec copy -acodec copy $tmp/mpg.mpg] "\n"] {
-			log $line 1
+			log $line 0
 		}
 	    } msg]} {
-		log "Error during mpg extract: $msg" 1
+		log "Error during mpg extract: $msg" 0
+		system notify "$file - auto-mpg - error $msg."
 		return
 	}
 
 	# Move the MPG into the local directory
 	file rename $tmp/mpg.mpg $file.mpg
+	runplugin postmpg $ts
+}
+
+proc do_mp3 {ts} {
+	global tmp tsgroup
+
+	set file [file rootname [$ts get file]]
+
+	if {[file exists $file.mp3]} {
+		# Already done.
+		return
+	}
+
+	if {[$ts flag "ODEncrypted"]} {
+		log "  $file - Not decrypted." 2
+		return
+	}
+
+	if {[$ts get definition] eq "HD"} {
+		# Cannot extract a useful MP3 from a HD recording.
+		log "  $file - High definition." 2
+		return
+	}
+
+	if {[$ts inuse]} {
+		log "  $file - In use."
+		return
+	}
+	runplugin premp3 $ts
+	dsc [$ts size]
+
+	log "     MP3: $file" 0
+	log "          Converting..." 0
+	if {[catch {
+		foreach line [split \
+		    [exec nice -n 19 /mod/bin/ffmpeg -y -benchmark -v 0 \
+		    -i $file.ts \
+		    -f mp3 -vn -acodec copy $tmp/mp3.mp3] "\n"] {
+			log $line 0
+		}
+	    } msg]} {
+		log "Error during mp3 extract: $msg" 0
+		system notify "$file - auto-mp3 - error $msg."
+		return
+	}
+
+	if {[system pkginst id3v2]} {
+		log [exec /mod/bin/id3v2 \
+		    --song "[$ts get title]" \
+		    --comment "[$ts get synopsis]" \
+		    --album "[$ts get channel_name]" \
+		    --year "[clock format [$ts get start] -format {%Y}]" \
+		    "$tmp/mp3.mp3"] 0
+	}
+
+	# Move the MP3 into the local directory
+	file rename $tmp/mp3.mp3 $file.mp3
+	runplugin postmp3 $ts
 }
 
 proc entries {dir callback} {
@@ -327,23 +473,28 @@ proc entries {dir callback} {
 }
 
 proc shrink {dir} {
-	log "SHRINK: \[$dir]"
+	log "SHRINK: \[$dir]" 2
 	entries $dir do_shrink
 }
 
 proc decrypt {dir} {
-	log "DECRYPT: \[$dir]"
+	log "DECRYPT: \[$dir]" 2
 	if {$::dlnaok} { entries $dir do_decrypt }
 }
 
 proc mpg {dir} {
-	log "MPG: \[$dir]"
+	log "MPG: \[$dir]" 2
 	entries $dir do_mpg
 }
 
+proc mp3 {dir} {
+	log "MP3: \[$dir]" 2
+	entries $dir do_mp3
+}
+
 proc expire {dir} {
 	global ax_days
-	log "EXPIRE: \[$dir]"
+	log "EXPIRE: \[$dir]" 2
 	
 	set ax_days [{dir expiry} $dir]
 	entries $dir do_expire
@@ -354,10 +505,10 @@ proc scan {dir attr {force 0}} {{indent 0}} {
 
 	incr indent 2
 
-	log "[string repeat " " $indent]\[$dir]"
+	log "[string repeat " " $indent]\[$dir]" 2
 
 	if {$dir eq $dustbin} {
-		log "Dustbin, skipping."
+		log "Dustbin, skipping." 2
 		return
 	}
 
@@ -365,18 +516,18 @@ proc scan {dir attr {force 0}} {{indent 0}} {
 		# Special folder
 		file stat "$dir/" st
 		if {$st(dev) != $::rootdev} {
-			log "Special folder on different device, skipping."
+			log "Special folder on different device, skipping." 2
 			return
 		}
 		if {$force} {
 			set force 0
-			log "Special folder, overriding recursion."
+			log "Special folder, overriding recursion." 2
 		}
 	}
 
 	# Recursion
 	if {!$force && [file exists "$dir/.auto${attr}r"]} {
-		log "[string repeat " " $indent]  (R)"
+		log "[string repeat " " $indent]  (R)" 2
 		set force 1
 	}
 
@@ -390,26 +541,30 @@ proc scan {dir attr {force 0}} {{indent 0}} {
 		}
 	}
 
+	dorecalc $dir
+
 	incr indent -2
 }
 
 set root [system mediaroot]
 file stat "$root/" rootstat
 set rootdev $rootstat(dev)
-#log "Root device: $rootdev" 1
+log "Root device: $rootdev" 2
 
 if {[llength $argv] > 0} {
-	set debug 1
+	set loglevel 2
 	foreach arg $argv { scan $root $arg }
 } else {
-	foreach arg {dedup decrypt shrink mpg expire} {
+	foreach arg $modules {
 		set st [clock milliseconds]
+		runplugin "pre${arg}scan"
 		scan $root $arg
-		log "$arg scan completed in [elapsed $st] seconds." 1
+		runplugin "post${arg}scan"
+		log "$arg scan completed in [elapsed $st] seconds."
 	}
 }
 
 release_lock webif_auto
 
-log "Media scan completed in [elapsed $scanstart] seconds." 1
+log "Media scan completed in [elapsed $scanstart] seconds."
 

var/mongoose/lib/bin/diskattrs

@@ -0,0 +1,47 @@
+#!/mod/bin/jimsh
+
+source /mod/webif/lib/setup
+require system.class settings.class
+
+if {[system model] eq "HD"} exit
+
+set disk [system disk]
+set settings [settings]
+
+# Extract overall SMART status.
+set smart ""
+set line ""
+# smartctl uses non-zero exit status to indicate health hence catch.
+catch { set line [exec /mod/bin/smartctl -H $disk | sed -n 5p] } msg
+if {$msg ne "" && $line eq ""} { set line $msg }
+if {$line ne ""} {
+	set smart [string range [lindex [split $line :] 1] 1 end]
+	$settings _tval_setting "SMART_status" $smart
+}
+
+foreach line [split [exec /mod/bin/smartctl -A -f brief $disk] "\n"] {
+	regsub -all -- {[[:space:]]+} $line " " line
+	regsub -all -- {^[[:space:]]+} $line "" line
+	lassign [split $line] id name flags val worst thresh when rval
+	if {![string is integer $id]} continue
+	set attrs($id) $rval
+}
+
+#puts "Attrs: ($attrs)"
+puts "SMART: ($smart)"
+
+foreach a {
+    {5 "realloc"}
+    {10 "spinretry"}
+    {197 "pending"}
+    {198 "offline"}
+    } {
+	lassign $a id attr
+	if {![dict exists $attrs $id]} continue
+	puts "$attr: $attrs($id)"
+	$settings _nval_setting "SMART_$attr" $attrs($id)
+	if {$attrs($id) < [$settings _nval_setting "SMART_ack_$attr"]} {
+		$settings _nval_setting "SMART_ack_$attr" $attrs($id)
+	}
+}
+

var/mongoose/lib/browse.class

@@ -83,6 +83,13 @@ proc {dir iconset} {dir} {
 		lappend attrs "autompg=1"
 	}
 
+	set automp3 0
+	if {[file exists "$dir/.automp3"]} {
+		set automp3 1
+		lappend icons [_addicon "/img/mp3.png" "Auto-Audio Extract"]
+		lappend attrs "automp3=1"
+	}
+
 	set autoexpire 0
 	if {[file exists "$dir/.autoexpire"]} {
 		set days [{dir expiry} $dir]

var/mongoose/lib/cat

@@ -2,7 +2,7 @@
 if {![exists -proc cat]} {
 	proc cat {file} {
 		if {[catch {set fp [open $file r}]} { return }
-		puts [read $fp]
+		puts -nonewline [read $fp]
 		close $fp
 	}
 }

var/mongoose/lib/epg.class

@@ -5,7 +5,6 @@ if {![exists -proc sqlite3.open]} { package require sqlite3 }
 
 require settings.class progressbar rsv.class mwildcard
 
-
 set ::epgpath /mnt/hd1/dvbepg/epg.dat
 set ::epgdbpath /mnt/hd1/epg.db
 set ::hdepgpath /media/drive1/epgsavedata
@@ -22,8 +21,6 @@ if {[file exists $::epgdbpath]} {
 	set ::qepg 1
 }
 
-set ::rsvlookup [rsv lookuptab]
-
 #  * service_id, event_id, start, duration, encrypted, name, text
 #  * warning, content code, content type,
 #  * event CRID, series CRID, rec CRID
@@ -48,7 +45,7 @@ class epg {
 	channel_crid	""
 	channel_hsvc	0
 
-	sched_type	0
+	sched_type	-1
 	rsv		0
 }
 
@@ -122,7 +119,7 @@ epg method type_icon {} {
 }
 
 proc {epg channelicon} {name {width 0} {style ""}} {
-	set str "<img src=\"/img/channels/$name.png\"";
+	set str "<img src=\"/img/channels/out/$name.png\"";
 	if {$width > 0} { append str " width=$width" }
 	if {$style ne ""} { append str " style=\"$style\" }
 	append str " alt=\"\">"
@@ -130,7 +127,7 @@ proc {epg channelicon} {name {width 0} {style ""}} {
 }
 
 epg method channel_icon {{width 0} {style ""}} {
-	set str "<img src=\"/img/channels/$channel_name.png\"";
+	set str "<img src=\"/img/channels/out/$channel_name.png\"";
 	if {$width > 0} { append str " width=$width" }
 	if {$style ne ""} { append str " style=\"$style\" }
 	append str " alt=\"\">"
@@ -175,13 +172,45 @@ epg method get_rsv {} {
 }
 
 epg method process_sched {} {
+	$self scheduled
+}
+
+set rsvlookup ""
+
+epg method scheduled {} {
+	global rsvlookup
+
+	if {$sched_type >= 0} { return $sched_type }
 	set sched_type 0
-	if {$event_crid ne "" && "$channel_hsvc$event_crid" in $::rsvlookup} {
-		set sched_type 1
-	} elseif {$series_crid ne "" &&
-	    "$channel_hsvc$series_crid" in $::rsvlookup} {
-		set sched_type 2
+
+	if {$rsvlookup eq ""} {
+		set rsvlookup [rsv lookuptab]
+		#puts $rsvlookup
 	}
+
+	set p 0
+	foreach key [list \
+	    "$service_id:$event_id" \
+	    [string tolower "$service_id:$channel_crid$series_crid"] \
+	    [string tolower "$service_id:$channel_crid$event_crid"] \
+	] {
+		#puts "Check key ($key)"
+		if {[dict exists $rsvlookup $key]} {
+			set p $rsvlookup($key)
+			#puts "FOUND ($p)"
+			break
+		}
+	}
+
+	switch $p {
+	    S		{ set sched_type 2 }
+	    E		{ set sched_type 1 }
+	    default	{ set sched_type 0 }
+	}
+
+	#puts "SCHED_TYPE: ($sched_type)"
+
+	return $sched_type
 }
 
 epg method icon_set {{height 0}} {

var/mongoose/lib/epg_search

@@ -31,7 +31,7 @@ puts ">
 "
 
 proc cts {type img text} {
-	puts "<a href=/cgi-bin/epg/search.jim?ct=$type>
+	puts "<a href=\"/cgi-bin/epg/search.jim?ct=$type\">
 		<img height=18 border=0 src=/images/173_3_00_G3_$img.png>
 		&nbsp;$text</a>";
 }
@@ -96,7 +96,8 @@ if {[llength $res] > 0} {
 		set kw [string range [lindex $keyword 1] 1 end]
 		# Clean the keyword string.
 		regexp -nocase {^(\w+)} $kw kw
-		puts "<td><a href=/cgi-bin/epg/search.jim?term=[cgi_quote_url $kw]>$kw
+		puts "<td><a href=\"/cgi-bin/epg/search.jim?term=[\
+		    cgi_quote_url $kw]\">$kw
 		    </a></td>"
 	}
 	puts "

var/mongoose/lib/rsv.class

@@ -318,6 +318,40 @@ proc {rsv list} {{table tbl_reservation} {extra ""}} {
 }
 
 proc {rsv lookuptab} {} {
+	set records {}
+	foreach tab {tbl_reservation pending} {
+		set res [$::rsvdb query "
+			select usSvcId, usevtid, ucCRIDType, szCRID,
+			    ucRecKind
+			from $tab left join channel.TBL_SVC
+			on $tab.hSvc = channel.TBL_SVC.hSvc
+			where ersvtype <= 3
+		"]
+
+		foreach rec $res {
+			if {$rec(ucRecKind) == 4} {
+				set p "S"
+			} else {
+				set p "E"
+			}
+			set records("$rec(usSvcId):$rec(usevtid)") $p
+			if {$rec(szCRID) eq ""} continue
+			if {$rec(ucCRIDType) == 49} {
+				set p "E"
+			} elseif {$rec(ucCRIDType) == 50} {
+				set p "S"
+			} else {
+				continue
+			}
+			set records([\
+			    string tolower "$rec(usSvcId):$rec(szCRID)"]) $p
+		}
+	}
+
+	return $records
+}
+
+proc {rsv xlookuptab} {} {
 	set records {}
 	foreach tab {tbl_reservation pending} {
 		set res [$::rsvdb query "

var/mongoose/lib/settings.class

@@ -24,8 +24,10 @@ class settings {
 	pkgdev		0
 	notoolbar	0
 	nomobile	0
+	nohelplinks	0
 	xepghours	4
 	genrededup	0
+	autolog		0
 }
 
 settings method hostname {{name ""}} {
@@ -100,6 +102,29 @@ settings method _nval_setting {name {val -1}} {
 	}
 }
 
+settings method _tval_setting {name {val -1}} {
+	global settingsdb
+
+	if {$val == -1} {
+		# Get
+		set res [$settingsdb query "
+			select tval from settings
+			where name = '$name'
+		"]
+		if {$res ne ""} {
+			return [lindex [lindex $res end] end]
+		}
+		return 0
+	} else {
+		# Set
+		$settingsdb query "
+			replace into settings(name,tval)
+			values('$name', '%s')
+		" $val
+		return 0
+	}
+}
+
 settings method channel_group {{group -1}} {
 	return [$self _nval_setting channel_group $group]
 }
@@ -136,10 +161,18 @@ settings method nomobile {{val -1}} {
 	return [$self _nval_setting nomobile $val]
 }
 
+settings method nohelplinks {{val -1}} {
+	return [$self _nval_setting nohelplinks $val]
+}
+
 settings method sortorder {{val -1}} {
 	return [$self _nval_setting sortorder $val]
 }
 
+settings method autolog {{level -1}} {
+	return [$self _nval_setting autolog $level]
+}
+
 settings method channel_groups {} {
 	set ret ""
 	set db [sqlite3.open /var/lib/humaxtv/setup.db]
@@ -232,3 +265,14 @@ settings method delacluser {user} {
 	return $msg
 }
 
+settings method smartdata {} {
+	global settingsdb
+
+	set res [$settingsdb query "
+		select name, nval, tval from settings
+		where name like 'SMART_%%'
+	"]
+
+	return $res
+}
+

var/mongoose/lib/setup

@@ -17,9 +17,9 @@ if {![exists -proc require]} {
 			puts -nonewline "Pragma: no-cache\r\n"
 			puts -nonewline "Cache-Control: no-cache\r\n"
 		} else {
-			puts "Content-Type: $type; charset=\"UTF-8\"\r\n"
+			puts -nonewline "Content-Type: $type; charset=\"UTF-8\"\r\n"
 		}
-		puts -nonewline $extra
+		if {$extra ne ""} { puts -nonewline "$extra" }
 		puts -nonewline "\r\n"
 		set done 1
 	}

var/mongoose/lib/system.class

@@ -139,6 +139,10 @@ proc {system diskspace} {} {
 	return [list $size $used $perc $free $fperc $dev]
 }
 
+proc {system disk} {} {
+	return [string range [lindex [system diskspace] 5] 0 end-1]
+}
+
 proc {system diskfree} {} {
 	switch [system model] {
 		HDR { set part /mnt/hd2 }
@@ -244,3 +248,11 @@ proc {system is_listening} {mport} {
 	return [llength [system listening $mport]]
 }
 
+proc {system notify} {msg} {
+	set logfd [open "/mod/tmp/notify.log" "a+"]
+	puts $logfd "[\
+	    clock format [clock seconds] -format "%d/%m/%Y %H:%M"\
+	    ] - $msg"
+	$logfd close
+}
+

var/mongoose/lib/ts.class

@@ -1,5 +1,6 @@
 
 if {![exists -proc class]} { package require oo }
+if {![exists -proc pack]} { package require pack }
 source /mod/webif/lib/setup
 require tdelete system.class
 
@@ -76,6 +77,7 @@ ts method lock {} {
 ts method set_shrunk {} {
 	set cmd [list /mod/bin/hmt +shrunk $file]
 	exec {*}$cmd
+	lappend flags "Shrunk"
 	return 1
 }
 
@@ -235,6 +237,53 @@ ts method dlnaloc {{urlbase 0}} {
 	if {$url ne "" } { return [list $url $mime] } else { return {} }
 }
 
+ts method cleanbmp {} {
+	set bfile [file rootname $file]
+	foreach f [glob -nocomplain "${bfile}*.bmp"] {
+		file delete $f
+	}
+}
+
+ts method mkbmps {{offset 0}} {
+	set bfile [file rootname $file]
+	if {[catch {
+	    exec /mod/bin/ffmpeg -loglevel fatal -ss $offset -i $file \
+	    -vf fps=fps=2 -frames 5 \
+	    -pix_fmt argb -vf vflip -s 140x78 "${bfile}%d.bmp"
+	} msg]} {
+		puts "ERROR: $msg"
+		return 0
+	}
+	return 1
+}
+
+ts method mkbmp {{offset 0} {ext ""}} {
+	set bfile [file rootname $file]
+	if {[catch {
+	    exec /mod/bin/ffmpeg -loglevel fatal -ss $offset -i $file \
+	    -frames 1 -pix_fmt argb -vf vflip -s 140x78 "$bfile$ext.bmp"
+	} msg]} {
+		puts "ERROR: $msg"
+		return 0
+	}
+	return 1
+}
+
+ts method mkthm {{offset 0}} {
+	if {![$self mkbmp $offset]} { return 0 }
+	set bfile [file rootname $file]
+	if {[catch {
+	    exec /bin/dd if=$bfile.bmp of=$bfile.thm~ bs=54 skip=1
+	    } msg]} {
+		puts "ERROR: $msg"
+		return 0
+	}
+	exec /bin/echo -n " " >> $bfile.thm~
+	file rename -force $bfile.thm~ $bfile.thm
+	tdelete $bfile.bmp
+	return 1
+}
+
 proc {ts renamegroup} {from to} {
 	global tsgroup
 
@@ -285,3 +334,37 @@ proc {ts genrelist} {} {
 	}
 }
 
+proc {ts resetnew} {dir} {
+	if {![file isdirectory $dir]} return
+	if {![file exists "$dir/.series"]} return
+
+	set tot 0
+	set watched 0
+	foreach file [readdir -nocomplain $dir] {
+		if {![string match {*.ts} $file]} { continue }
+		incr tot
+		if {[set ts [ts fetch "$dir/$file"]] != 0} {
+			if {![$ts flag "New"]} { incr watched }
+		}
+	}
+
+	set fd [open "$dir/.series"]
+	set bytes [read $fd]
+	close $fd
+	set recs [unpack $bytes -uintle 0 32]
+	set played [unpack $bytes -uintle 32 32]
+
+	#puts "Current: $played/$recs"
+	#hexdump $bytes
+	#puts "Calculated: $watched/$tot"
+
+	pack bytes $tot -intle 32 0 
+	pack bytes $watched -intle 32 32
+
+	#hexdump $bytes
+
+	set fd [open "$dir/.series" "w"]
+	puts -nonewline $fd $bytes
+	close $fd
+}
+