update

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

CONTROL/control

@@ -1,9 +1,9 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 0.9.3-5
+Version: 0.13.2
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
-Depends: mongoose(>=3.0-7),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73),jim-cgi(>=0.5),service-control(>=1.2),busybox(>=1.19.3-1),lsof,epg(>=1.0.9),hmt(>=1.1.6),ssmtp,anacron,trm,openssl-command,nicesplice,id3v2,file,rsvsync
-Suggests: ffmpeg,webif-iphone
+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
 Description: An evolving web interface for the Humax.

CONTROL/postinst

@@ -1,7 +1,21 @@
 #!/bin/sh
 
+echo "Postinstall $*"
+
 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
+
 # Add anacron jobs
 
 ana=$PKG_ROOT/etc/anacrontab
@@ -13,5 +27,16 @@ grep -v 'backup/backup.jim' $ana > $tmpf
 
 $PKG_ROOT/etc/init.d/S02anacron start < /dev/null > /dev/null 2>&1 &
 
+[ -f /tmp/webif_auto.log ] && rm -f /tmp/webif_auto.log
+
+if [ ! -f /mod/webif/.strip-updated ]; then
+	echo "*********************************"
+	echo "* Please wait while any shrunk recordings are flagged..."
+	echo "*********************************"
+	/mod/webif/lib/bin/strip-update
+
+	touch /mod/webif/.strip-updated
+fi
+
 exit 0
 

CONTROL/prerm

@@ -2,6 +2,13 @@
 
 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
+fi
+
 ana=/mod/etc/anacrontab
 grep -v 'backup/backup.jim' $ana > $tmpf
 cp $tmpf $ana

bin/status

@@ -0,0 +1 @@
+../webif/cgi-bin/status.jim

etc/init.d/S60parseepg

@@ -1,16 +1,16 @@
 #!/bin/sh
 
-if [ -f /mnt/hd1/dvbepg/epg.dat ]; then
-	epg=/mnt/hd1/dvbepg/epg.dat
-	epgdb=/mnt/hd1/epg.db
-else
+if [ "`cat /etc/model`" = HD ]; then
 	epg=/media/drive1/epgsavedata
 	epgdb=/media/drive1/epg.db
+else
+	epg=/mnt/hd1/dvbepg/epg.dat
+	epgdb=/mnt/hd1/epg.db
 fi
 
 case "$1" in
 	start)
-		/mod/bin/epg -f $epg sqlitedumpd $epgdb > /tmp/epgd.log &
+		/mod/bin/epg -f $epg sqlitedumpd $epgdb > /tmp/epgd.log 2>&1 &
 		;;
 	stop)
 		killall -q epg

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

@@ -1,17 +1,13 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 
 require rsv.class
 
 set dir /mod/var/backup
 
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
+httpheader
 
 set now [clock seconds]
 set file [file tail [cgi_get file \
@@ -19,7 +15,7 @@ set file [file tail [cgi_get file \
 
 if {[string match {auto-*} $file]} {
 	# Delete any automatic backups over 7 days old.
-	set mt $(7 * 86400)
+	set mt $(15 * 86400)
 	foreach af [glob -nocomplain "$dir/auto-*"] {
 		set aft [file mtime $af]
 		set diff $($now - $aft)
@@ -68,16 +64,17 @@ set grp 0
 foreach res [$rsvdb query {
 	select	eFavGroup,
 		TBL_FAV.eSvcType,
-		substr(szSvcName, 2) as szSvcName
+		substr(szSvcName, 2) as szSvcName,
+		favIdx
 	from TBL_FAV join TBL_SVC using (hSvc)
-	order by eFavGroup
+	order by eFavGroup, favIdx
     }] {
 	if {$res(eFavGroup) != $grp} {
 		set grp $res(eFavGroup)
 		puts "  Group $grp"
 	}
 	puts "    $res(szSvcName)"
-	puts $fd "fav\t$res(eFavGroup)\t$res(eSvcType)\t$res(szSvcName)"
+	puts $fd "fav\t$res(eFavGroup)\t$res(eSvcType)\t$res(szSvcName)\t$res(favIdx)"
 }
 puts "Done."
 

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

@@ -7,6 +7,8 @@ function refresh_files()
 			    .button('option', 'disabled', false);
 			$('#delete_button').removeAttr('disabled')
 			    .button('option', 'disabled', false);
+			$('#view_button').removeAttr('disabled')
+			    .button('option', 'disabled', false);
 		});
 	});
 }
@@ -38,6 +40,15 @@ $(document).ready(function() {
 			});
 		}
 	});
+	$('#view_button').click(function() {
+		var backup = $('input.restore:checked').val();
+		$('#results').load('/cgi-bin/backup/view.jim?' +
+		    $('input.restore').serialize(), function() {
+			$('#results').slideDown(function() {
+				refresh_files();
+			});
+		});
+	});
 	$('#restore_button').click(function() {
 		var backup = $('input.restore:checked').val();
 		if (confirm('!!!!!!!!!!!!!!!!!!!!!!!!! PLEASE CONFIRM !!!!!!!!!!!!!!!!!!!!!!!!!\n\nAre you sure you wish to erase all scheduled recordings and favourite channels and then restore them from\n' + backup + '?'))

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

@@ -1,24 +1,18 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 
 set dir /mod/var/backup
 
-puts "Content-Type: text/html"
-puts "Pragma: no-cache"
-puts "Expires: Thu, 01 Jan 1970 00:00:00 GMT"
-puts ""
+httpheader
 
-cgi_input
-#cgi_dump
-
-if {![dict exists $_cgi restore_file]} {
+set file [file tail [cgi_get restore_file]]
+if {$file == 0} {
 	puts "No filename supplied."
 	exit
 }
 
-set file [file tail [dict get $_cgi restore_file]]
 set ffile "/$dir/$file.rbk"
 
 if {![file exists $ffile]} {

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

@@ -1,11 +1,9 @@
 #!/mod/bin/jimsh
 
 package require cgi
+source /mod/webif/lib/setup
 
-puts "Content-Type: text/html"
-puts "Pragma: no-cache"
-puts "Expires: Thu, 01 Jan 1970 00:00:00 GMT"
-puts ""
+httpheader
 
 set dir "/mod/var/backup"
 

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

@@ -1,26 +1,20 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 
 require rsv.class findhsvc system.class
 
 set dir /mod/var/backup
 
-puts "Content-Type: text/html"
-puts ""
+httpheader
 
-cgi_input
-#cgi_dump
-
-#set _cgi(restore_file) "backup-2011-Jul-09-20:37"
-
-if {![dict exists $_cgi restore_file]} {
+set file [file tail [cgi_get restore_file]]
+if {$file == 0} {
 	puts "No filename supplied."
 	exit
 }
 
-set file [file tail [dict get $_cgi restore_file]]
 set ffile "/$dir/$file.rbk"
 
 if {![file exists $ffile]} {
@@ -53,6 +47,9 @@ foreach line $data {
 		lappend vars $f [lindex $vals $i]
 	}
 
+	# Don't restore DSO events.
+	if {$vars(ersvtype) == 11} { continue }
+
 	set rsv [rsv new $vars]
 
 	# Need to fix up channel and CRID mappings in case something has
@@ -89,6 +86,14 @@ puts "Restoring favourite channels..."
 $rsvdb query {begin transaction;}
 $rsvdb query {delete from channel.TBL_FAV}
 
+$rsvdb query {drop table if exists pending.fav}
+$rsvdb query {create table pending.fav (
+		favIdx integer primary key autoincrement unique,
+		hSvc integer(4),
+		eFavGroup integer(4),
+		[eSvcType] integer(4)
+	)}
+
 set grp 0
 foreach line $data {
 	set vals [split $line "\t"]
@@ -97,6 +102,8 @@ foreach line $data {
 	set group [lindex $vals 1]
 	set type [lindex $vals 2]
 	set chan [lindex $vals 3]
+	set idx [lindex $vals 4]
+	if {$idx eq ""} { set idx 0 }
 	set hsvc [get_channel_attr $chan]
 
 	if {$grp != $group} {
@@ -112,8 +119,8 @@ foreach line $data {
 	}
 
 	set query "
-		insert into channel.TBL_FAV(hSvc, eFavGroup, eSvcType)
-		values($hsvc, $group, $type);
+		insert into pending.fav(favIdx, hSvc, eFavGroup, eSvcType)
+		values($idx, $hsvc, $group, $type);
 	"
 
 	$rsvdb query $query

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

@@ -0,0 +1,54 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+
+require rsv.class findhsvc
+
+set dir /mod/var/backup
+
+httpheader
+
+set file [file tail [cgi_get restore_file]]
+if {$file == 0} {
+	puts "No filename supplied."
+	exit
+}
+
+set ffile "/$dir/$file.rbk"
+
+if {![file exists $ffile]} {
+	puts "Backup file <i>$file</i> does not exist."
+	exit
+}
+
+if {[catch { set fd [open $ffile r] } msg]} {
+	puts "Error opening <i>$file</i> - $msg"
+	exit
+}
+
+puts "Listing scheduled events from <i>$file</i>..."
+
+set fields [lsort [[rsv] vars]]
+
+set data [split [read $fd] "\n"]
+
+foreach line $data {
+	set vals [split $line "\t"]
+	if {[lindex $vals 0] ne "event"} { continue }
+	set vars {}
+	set i 0
+	foreach f $fields {
+		if {$f eq "aulEventToRecordInfo"} { continue }
+		incr i
+		lappend vars $f [lindex $vals $i]
+	}
+
+	set rsv [rsv new $vars]
+
+	puts "  [$rsv name] ([$rsv channel_name])"
+}
+
+close $fd
+rsv cleanup
+

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

@@ -1,167 +0,0 @@
-#!/mod/bin/jimsh
-
-puts {
-
-<div id=jbar></div>
-
-<ul id=optmenu class=contextMenu style="width: 160px">
-	<li class=delete><a href=#delete>Delete</a></li>
-	<li class=cut><a href=#cut>Cut to clipboard</a></li>
-	<li class=pwcopy><a href=#copy>Copy to clipboard</a></li>
-
-	<li class=separator><a href=#rename>Rename</a></li>
-	<li><a href=#download>Download</a></li>
-
-}
-if {$model eq "HDR"} {
-	puts { <li class="separator"><a href=#decrypt>Decrypt</a></li> }
-}
-if {[system pkginst ffmpeg]} {
-	puts {
-		<li><a href=#audio>Extract Audio</a></li>
-		<li><a href=#mpg>Extract to MPG</a></li>
-	}
-}
-if $nicesplice {
-	puts {
-		<li class="cut"><a href=#crop>Crop</a></li>
-		<li class="cut"><a href=#chunk>Split (45m parts)</a></li>
-	}
-}
-puts {
-	<li class=separator><a href=#lock>Toggle Lock</a></li>
-	<li><a href=#enc>Toggle Enc</a></li>
-	<li><a href=#new>Toggle New</a></li>
-</ul>
-
-<ul id=doptmenu class=contextMenu style="width: 160px">
-	<li class=delete><a href=#delete>Delete</a></li>
-	<li class=cut><a href=#cut>Cut to clipboard</a></li>
-	<li class=pwcopy><a href=#copy>Copy to clipboard</a></li>
-	<li class=separator><a href=#rename>Rename</a></li>
-}
-
-if $flatten {
-	puts { <li class="separator"><a href=#flat>No-Flatten</a></li> }
-}
-
-puts {
-</ul>
-
-<div id=renameform title="Rename media file" style="display: none">
-	<form id=renameform_form>
-	<input type=hidden name="renameorig" id="renameorig" value="">
-	<input type=hidden name="titleorig" id="titleorig" value="">
-	<table border=0>
-	<tr>
-	<th>
-		<label for="rename">
-			<b>New Filename</b>
-		</label>
-	</th>
-	<td>
-		<input type=text name="rename" id="rename"
-		    value="" size=70 maxlength=255
-		    class="text ui-widget-content ui-corner-all">
-	</td>
-	</tr>
-	<tr style="display: none" class=tstype>
-	<th>
-		<label for="renametitle" style="padding-top: 0.5em">
-			<b>New Medialist Title</b>
-		</label>
-	</th>
-	<td>
-		<input type=text name="renametitle" id="renametitle"
-		    value="" size=70 maxlength=48
-		    class="text ui-widget-content ui-corner-all">
-	</td>
-	</tr>
-	<tr style="display: none" class=tstype>
-	<td colspan=2 id=synopsis style="font-style: italic"></td>
-	</tr>
-	</table>
-	</form>
-</div>
-
-<div id=drenameform title="Rename directory" style="display: none">
-	<form id=drenameform_form>
-	<input type=hidden name="renameorig" id="drenameorig" value="">
-	<table border=0>
-	<tr>
-	<th>
-		<label for="drename">
-			<b>New Directory Name</b>
-		</label>
-	</th>
-	<td>
-		<input type=text name="rename" id="drename"
-		    value="" size=70 maxlength=255
-		    class="text ui-widget-content ui-corner-all">
-	</td>
-	</tr>
-	</table>
-	</form>
-</div>
-
-<div id=savestreamform title="Save streamed content"
-    style="display: none">
-	<div class=pre id=savestream_detail></div>
-	<form id=savestream_form>
-}
-puts "<input type=hidden name=dir value=\"$dir\">"
-puts {
-	<table border=0>
-	<tr>
-	<th>
-		<label for="savestream_name">
-			<b>Filename</b>
-		</label>
-	</th>
-	<td>
-		<input type=text name="savestream_name"
-		    id="savestream_name"
-		    value="" size=70 maxlength=255
-		    class="text ui-widget-content ui-corner-all">
-		<img id=savestream_spin src=/img/loading.gif>
-	</td>
-	</tr>
-	</table>
-	</form>
-</div>
-
-<div id=newdirform title="New Folder" style="display: none">
-	<form id=newdirform_form>
-}
-puts "<input type=hidden name=dir value=\"$dir\">"
-puts {
-	<table border=0>
-	<tr>
-	<th>
-		<label for="newdirname">
-			<b>New Folder Name</b>
-		</label>
-	</th>
-	<td>
-		<input type=text name="newdirname" id="newdirname"
-		    value="" size=70 maxlength=255
-		    class="text ui-widget-content ui-corner-all">
-	</td>
-	</tr>
-	</table>
-	</form>
-</div>
-
-<div id=dialogue></div>
-<div id=confirm title="Confirmation Required"></div>
-<div id=pwdialogue style="display: none">
-<center>
-<img src=/img/loading.gif>
-<br><br>
-Please wait...
-<div id=pwfeedback></div>
-</center>
-</div>
-
-}
-

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

@@ -1,101 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/var/mongoose/lib/setup
-require ts.class pretty_size system.class tdelete
-
-puts "Content-Type: text/html\r\n"
-
-cgi_input
-#cgi_dump
-
-set dir [cgi_get dir]
-regsub -all {([\\["$])} $dir {\\\1} dir
-
-#puts "DIR: ($dir)"
-
-if {[system pkginst undelete]} {
-	set dustbin [system dustbin]
-} else {
-	set dustbin ""
-}
-
-proc bindir {file} {
-	global dustbin
-	set dir [file dirname $file]
-	regsub "^[system mediaroot]" $dir $dustbin ndir
-	if {$dir eq $ndir} { set ndir $dustbin }
-	system mkdir_p $ndir
-	return $ndir
-}
-
-proc touch {file} {
-	exec /mod/bin/busybox/touch $file
-}
-
-puts "<div id=deleting class=blood><img src=/img/loading.gif>Deleting...</div>"
-puts "<ul style=\"list-style-type: square\">"
-
-foreach file [cgi_get files] {
-
-	puts -nonewline "<li>\"$file\"..."
-
-	if {![string match "$dir/*" $file]} {
-		puts "Error - outside directory."
-		continue
-	}
-
-	if {$dustbin ne "" && [string first $dustbin $file] > -1} {
-		set ldustbin ""
-	} else {
-		set ldustbin $dustbin
-	}
-
-	set done 0
-	if {[file isdirectory $file]} {
-		puts -nonewline "Directory..."
-		if {$ldustbin ne ""} {
-			set ndir "[bindir $file]/[file tail $file]"
-			while {[file isdirectory $ndir]} { append ndir "_" }
-			file rename $file $ndir
-			touch $ndir
-		} else {
-			tdelete $file
-		}
-		puts -nonewline "Done..."
-		set done 1
-	} elseif {[string match {*.ts} $file]} {
-		set ts [ts fetch $file]
-
-		# Check TS validity
-		if {![catch {$ts get file}]} {
-			if {$ldustbin ne ""} {
-				$ts move [bindir $file] 1
-			} else {
-				if {[$ts delete]} {
-					puts "Successfully deleted $file."
-				} else {
-					puts "Problem deleting $file, [$ts get error]"
-				}
-			}
-			set done 1
-		}
-		# else treat as normal file.
-	}
-
-	if {!$done} {
-		if {$ldustbin ne ""} {
-			set nfile "[bindir $file]/[file tail $file]"
-			file rename $file $nfile
-			touch $nfile
-		} else {
-			tdelete $file
-		}
-		catch {file delete "[file rootname $file].hmi"}
-		puts -nonewline "Done..."
-	}
-
-	puts "</li>"
-}
-puts "</ul>"
-

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

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

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

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

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

@@ -1,28 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/var/mongoose/lib/ts.class
-
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
-
-set dir [cgi_get file]
-if {![file isdirectory $dir]} { exit }
-set noflat 0
-if {[string match {\[*\]} [file tail $dir]]} { 
-	set ndir [string range [file tail $dir] 1 end-1]
-	file rename $dir "[file dirname $dir]/$ndir"
-	puts "Unflagged directory as noflatten."
-	exit
-}
-if {[file exists "$dir/.noflatten"]} {
-	file delete "$dir/.noflatten"
-	puts "Unflagged directory as noflatten."
-} else {
-	close [open "$dir/.noflatten" w]
-	puts "Flagged directory as noflatten."
-}
-

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

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

var/mongoose/cgi-bin/cat.jim

@@ -1,7 +1,7 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 require system.class chunked pretty_size
 
 cgi_input

var/mongoose/cgi-bin/cfwreset.cgi

@@ -1,7 +1,18 @@
 #!/bin/sh
 
+[ -n "$QUERY_STRING" ] && rma="${QUERY_STRING##*=}" || rma=0
+
 echo "Content-Type: text/plain"
 echo
 
-touch /var/lib/humaxtv/mod/_RESET_CUSTOM_FIRMWARE_ENVIRONMENT
+if [ "$rma" = 1 ]; then
+	modver="`cat /etc/modversion`"
+	if [ "$modver" -ge 215 ]; then
+		touch /var/lib/humaxtv_backup/.rma
+	else
+		touch /var/lib/humaxtv/.rma
+	fi
+else
+	touch /var/lib/humaxtv/mod/_RESET_CUSTOM_FIRMWARE_ENVIRONMENT
+fi
 

var/mongoose/cgi-bin/channel.jim

@@ -2,16 +2,11 @@
 
 package require cgi
 package require sqlite3
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 require altrow progressbar epg.class
 
-puts "Content-Type: text/html"
-puts ""
-
 header
 
-cgi_input
-
 proc f2c {frequency} {
 	set ch int($((($frequency / 1000) - 303.25) / 8))
 	return [expr int($ch)]
@@ -71,6 +66,7 @@ foreach tw [$db query {
 		switch $name {
 			"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)" }
 			"ITV3" { set mux "COM4/SDN" }
 			"Dave" { set mux "COM5/ARQ A" }

var/mongoose/cgi-bin/db.jim

@@ -2,20 +2,14 @@
 
 package require cgi
 package require sqlite3
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 require altrow
 
-puts "Content-Type: text/html"
-puts ""
-
 set databases [glob /var/lib/humaxtv/*.db]
 lappend databases "/mnt/hd2/dms_cds.db"
 
 header
 
-cgi_input
-#cgi_dump
-
 set ftab [cgi_get tab]
 set fdb [cgi_get db]
 
@@ -24,7 +18,7 @@ if {$fdb != 0} {
 }
 
 proc db_info {db_file} {
-	global _cgi fdb ftab
+	global fdb ftab
 
 	if {$fdb != 0 && [file tail $db_file] ne $fdb} { return }
 	if {![file exists $db_file]} { return }

var/mongoose/cgi-bin/env.jim

@@ -0,0 +1,9 @@
+#!/mod/bin/jimsh
+
+source /mod/webif/lib/setup
+httpheader "text/plain"
+
+foreach f [dict keys $env] {
+	puts "$f = $env($f)"
+}
+

var/mongoose/cgi-bin/epg/db.jim

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+PATH=$PATH:/mod/bin export PATH
+ 
+echo "Content-Type: text/plain"
+echo ""
+
+[ -n "$QUERY_STRING" ] && data="${QUERY_STRING##*=}" || data=epg
+
+case $data in
+	channels)
+		sqlite3 -header -batch -separator '	' \
+		    /var/lib/humaxtv/channel.db '
+			select * from TBL_SVC;
+		'
+		;;
+
+
+	*) /mod/bin/epg -p dump ;;
+esac
+
+exit 0
+

var/mongoose/cgi-bin/epg/dump.jim

@@ -1,24 +1,14 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 require epg.class
 
-puts "Content-Type: text/html"
-puts ""
-
 header
 
-cgi_input
-#cgi_dump
-
-set service 0
-set service 4351
-catch { set service [dict get $_cgi service] }
-set event 0
-catch { set event [dict get $_cgi event] }
-set raw 0
-catch { set raw [dict get $_cgi raw] }
+set service [cgi_get service]
+set event [cgi_get event]
+set raw [cgi_get raw]
 
 puts "<pre>"
 if { $raw == 0 } {

var/mongoose/cgi-bin/epg/info.jim

@@ -1,18 +1,14 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 require epg.class
 
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
+httpheader
 
 set service [cgi_get service 0]
 set event [cgi_get event 0]
-if {! [dict exists $_cgi bare]} { header }
+if {![cgi_exists bare]} header
 
 set record [lindex [epg fetch dump -service $service -event $event] 0]
 $record get_channel_info
@@ -135,5 +131,5 @@ puts "
 puts "<div id=epginfo_extra class=footnote></div>"
 
 epg cleanup
-if {! [dict exists $_cgi bare]} { footer }
+if {![cgi_exists bare]} footer
 

var/mongoose/cgi-bin/epg/schedule.jim

@@ -1,25 +1,20 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 require epg.class system.class
 
-puts "Content-Type: text/html"
-puts ""
+httpheader
 
-cgi_input
-#cgi_dump
+set service [cgi_get service -]
+set event [cgi_get event -]
+set type [cgi_get type 1]
 
-if {![dict exists $_cgi service] || ![dict exists $_cgi event]} {
+if {$service eq "-" || $event eq "-"} {
 	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."

var/mongoose/cgi-bin/epg/search.jim

@@ -1,11 +1,8 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/setup
-require epg.class spinner.class altrow
-
-puts "Content-Type: text/html"
-puts ""
+source /mod/webif/lib/setup
+require epg.class spinner.class altrow settings.class
 
 header
 
@@ -13,18 +10,12 @@ require totop
 
 puts "<script type=text/javascript src=/js/jquery.highlight.js></script>"
 
-cgi_input
-#cgi_dump
+set ct [cgi_get ct 0]
+set crid [cgi_get crid ""]
+set scrid [cgi_get scrid ""]
 
-set ct 0
-catch { set ct [dict get $_cgi ct] }
-set crid ""
-catch { set crid [dict get $_cgi crid] }
-set scrid ""
-catch { set scrid [dict get $_cgi scrid] }
-
-if {[dict exists $_cgi term]} {
-	set lterm [dict get $_cgi term]
+if {[cgi_exists term]} {
+	set lterm [cgi_get term]
 
 	if {[string match {CRID:*} $lterm]} {
 		set crid [string range $lterm 5 end]
@@ -47,20 +38,19 @@ require epg_search
 
 require epg_popup
 
-#set _cgi [dict create term "doctor who"]
-#set env(REQUEST_URI) "test"
-
 set cmd "search"
 if {$searchfull} { set cmd "searchall" }
 
+set dedup 0
 if {$ct > 0 } {
 	set records [epg fetch dump -type $ct]
+	if {[[settings] genrededup]} { set dedup 1 }
 } elseif {$crid ne ""} {
 	set records [epg fetch dump -crid $crid]
 } elseif {$scrid ne ""} {
 	set records [epg fetch dump -scrid $scrid]
 } elseif {$searchterm ne ""} { 
-	set records [epg fetch $cmd -extra $searchterm]
+	set records [epg dbfetch $cmd -term $searchterm]
 } else {
 	set records {}
 }
@@ -90,8 +80,15 @@ proc rsort {v1 v2} {
 	return -1
 }
 
+set seen {}
 set i 0
 foreach record [lsort -command rsort $records] {
+	if {$dedup} {
+		set ename [$record get name]
+		if {$ename in $seen} continue
+		lappend seen $ename
+	}
+
 	if {$favlist != "" && [$record get service_id] ni $favlist} {
 		continue
 	}

var/mongoose/cgi-bin/epg/service.jim

@@ -1,12 +1,9 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 require epg.class spinner.class altrow
 
-puts "Content-Type: text/html"
-puts ""
-
 header
 
 require totop
@@ -17,9 +14,6 @@ require totop
 	style "margin: 1em;"
 	}] start
 
-cgi_input
-#cgi_dump
-
 require epg_popup
 
 set service [cgi_get service 4351]
@@ -53,7 +47,7 @@ puts {
 set i 0
 foreach record $records {
 	altrow
-	$record get_channel_info
+	#$record get_channel_info
 	set ended [$record ended]
 	if {[$record showing]} {
 	    puts "<td><img src=/images/111_1_00_Cursor_2R_Arrow.png></td>"

var/mongoose/cgi-bin/opkg.jim

@@ -1,7 +1,7 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 require pkg.class chunked
 
 cgi_input
@@ -11,7 +11,7 @@ set cmd [cgi_get cmd update]
 
 proc opkg {cmd} {
 	chunk ">>> opkg $cmd\r\n"
-	set bcmd "|/mod/var/mongoose/lib/opkg $cmd"
+	set bcmd "|/mod/webif/lib/bin/opkg $cmd"
 	set fd [open $bcmd r]
 	while {[gets $fd line] >= 0} {
 		chunk "$line\r\n"
@@ -30,6 +30,9 @@ if {$cmd eq "update" || $cmd eq "upgrade"} {
 	chunk "Updating package meta information\r\n"
 	pkg fetchmeta
 	chunk "Done.\r\n"
+	chunk "Updating diagnostic meta information\r\n"
+	pkg fetchdiagmeta
+	chunk "Done.\r\n"
 }
 
 end_chunked

var/mongoose/cgi-bin/restart.jim

@@ -1,13 +1,10 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 require rsv.class system.class
 
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
+httpheader
 
 if {[cgi_get act] eq "cancel"} {
 	file delete /tmp/.restartpending

var/mongoose/cgi-bin/restartblock.jim

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

var/mongoose/cgi-bin/service.jim

@@ -1,15 +1,12 @@
 #!/mod/bin/jimsh
 
 package require cgi
+source /mod/webif/lib/setup
 
-puts "Content-Type: text/html"
-puts ""
+httpheader
 
-cgi_input
-#cgi_dump
-
-catch { set service [dict get $_cgi service] }
-catch { set action [dict get $_cgi action] }
+set service [cgi_get service]
+set action [cgi_get action]
 
 catch { puts [exec /mod/bin/service $action $service] }
 

var/mongoose/cgi-bin/settings.jim

@@ -1,15 +1,10 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/setup
-require settings.class
-require plugin
+source /mod/webif/lib/setup
+require settings.class plugin system.class
 
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
+httpheader
 
 if {[cgi_get act] eq "https"} {
 	if {[cgi_get val off] eq "off"} {
@@ -22,6 +17,17 @@ if {[cgi_get act] eq "https"} {
 	exit
 }
 
+if {[cgi_get act] eq "xtelnet"} {
+	if {[cgi_get val off] eq "off"} {
+		file delete /mod/boot/xtelnet
+		puts "Telnet server expert mode will be disabled after next reboot."
+	} else {
+		exec /mod/bin/busybox/touch /mod/boot/xtelnet
+		puts "Telnet server expert mode will be enabled after next reboot."
+	}
+	exit
+}
+
 set settings [settings new]
 
 set hostname [$settings hostname]
@@ -29,6 +35,11 @@ set smtp_server [$settings smtp_server]
 set channel_group [$settings channel_group]
 set epg_style [$settings epg_style]
 set pkgdev [$settings pkgdev]
+set notoolbar [$settings notoolbar]
+set nomobile [$settings nomobile]
+set xepghours [$settings xepghours]
+if {$xepghours == 0} { set xepghours 4 }
+set genrededup [$settings genrededup]
 
 # Handle updates
 
@@ -63,8 +74,12 @@ proc handle_str_update {var old {text "Value"}} {
 handle_str_update hostname $hostname Hostname
 _handle_update ascii smtp_server $smtp_server "SMTP Server"
 handle_int_update channel_group $channel_group "Channel Group"
+handle_int_update xepghours $xepghours "Grid EPG Hours"
 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 genrededup $genrededup "Genre search dedup"
 
 set acluser [cgi_get acluser "-"]
 set aclpass [cgi_get aclpass "-"]
@@ -140,6 +155,38 @@ puts ">
 	</tr>
 "
 
+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>
+"
+
+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>
+		</td>
+	</tr>
+"
+
+puts "
+</table></fieldset>
+<br><br>
+<fieldset style=\"display: inline\">
+	<legend>
+		EPG Settings
+	</legend>
+<table>
+"
+
 puts "
 	<tr>
 	<form class=auto id=epg_style method=get action=$env(REQUEST_URI)>
@@ -194,6 +241,44 @@ puts "
 	</tr>
 "
 
+puts "
+	<tr>
+	<form class=auto id=xepghours method=get action=$env(REQUEST_URI)>
+		<th class=key>Grid-style EPG Hours</th>
+		<td><select id=xepghours name=xepghours
+		    class=\"text ui-widget-content ui-corner-all\">
+"
+
+foreach xehopt {2 3 4 5 6} {
+	puts -nonewline "<option value=$xehopt"
+	if {$xehopt == $xepghours} {
+		puts -nonewline " selected"
+	}
+	puts ">$xehopt hours"
+}
+
+puts "
+		</select>
+		<small>
+		<input name=xepghours value=\"set\" type=submit>
+		</small>
+		<div id=xepghours_output></div>
+		</td>
+	</form>
+	</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>
+"
+
 puts "
 	</table>
 	</fieldset>
@@ -328,6 +413,24 @@ if {$pkgdev} { puts -nonewline " checked" }
 puts ">
 		</td>
 	</tr>
+"
+
+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>
+"
+
+}
+
+puts "
 	</table>
 	<div id=pkgdev_output></div>
 	</fieldset>

var/mongoose/cgi-bin/settings.js

@@ -21,16 +21,22 @@
 
 $(document).ready(function () {
 	$(":submit").button();
-	$(":checkbox").iphoneStyle();
+	//$('[type="checkbox"] :not(.yesno)').iphoneStyle();
+	$('[type="checkbox"]').iphoneStyle({
+		checkedLabel: 'YES',
+		uncheckedLabel: 'NO'
+	});
 	$('form.auto').each(function(i, el) {
 		var id = $(this).attr('id');
-		var output = '#' + id + '_output'
+		var output = '#' + id + '_output';
 		$(this).ajaxForm({
 			target: output,
 			success: function() {
-			    $(output).css('font-style', 'italic');
-			    $(output).show('slow');
-			    $(output).delay(2000).fadeOut('slow');
+			    $(output)
+				.css('font-style', 'italic')
+			    	.show('slow')
+			    	.delay(2000)
+				.fadeOut('slow');
 			}
 		});
 	});
@@ -73,5 +79,82 @@ $(document).ready(function () {
 				    .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')
+		    .empty()
+		    .show('slow')
+		    .load('/cgi-bin/settings.jim?notoolbar=' + arg,
+		        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')
+				    .css('font-style', 'italic')
+				    .delay(2000).fadeOut('slow');
+		    });
+	});
 });
 

var/mongoose/cgi-bin/status.jim

@@ -1,49 +1,183 @@
 #!/mod/bin/jimsh
 
-puts "Content-Type: text/html"
-puts ""
+package require cgi
+source /mod/webif/lib/setup
+require system.class findhsvc epg.class rsv.class
 
-if {[catch {set pid [exec pgrep humaxtv]}]} { exit }
+set runmode cli
+if {[string match {*jim} $argv0]} { set runmode cgi }
 
-if {[catch {set data [exec lsof -p $pid | grep Video | fgrep .ts]} ]} {
-        exit
+set schedtime 1200 
+case $runmode {
+    cgi {
+	set type [cgi_get type "full"]
+	httpheader
+    }
+    cli {
+	set type "full"
+	if {"-X" in $argv} { set schedtime 7200 }
+    }
 }
 
-set lines [split $data "\n"]
-foreach line $lines {
-	regsub -all -- {[[:space:]]+} $line " " line
-	set fields [split $line " "]
-	set name [lindex [split $line "/"] end]
-	set size($name) [lindex $fields 6]
-	set seen($name) 0
+if {[catch {set pid [exec pgrep humaxtv]}]} {
+	puts "Cannot find humaxtv process."
+	exit
 }
 
-sleep 2
+proc get_data {} {
+	global pid
 
-set data [exec lsof -p $pid | grep Video | fgrep .ts]
-regsub -all -- {[[:space:]]+} $line " " line
-set lines [split $data "\n"]
-foreach line $lines {
-	regsub -all -- {[[:space:]]+} $line " " line
-	set fields [split $line " "]
-	set name [lindex [split $line "/"] end]
-	set size2 [lindex $fields 6]
-
-	if { $size2 > $size($name) && $seen($name) < 1 } {
-		set mode "Recording"
-		set icon "745_1_11_Video_1REC.png"
+	set ret {}
+	if {[catch {set data \
+	    [exec /mod/bin/lsof -p $pid | grep Video | fgrep .ts]} ]} {
+		set ret {}
 	} else {
-		set mode "Watching"
-		set icon "745_1_10_Video_2Live.png"
+		foreach line [split $data "\n"] {
+			regsub -all -- {[[:space:]]+} $line " " line
+			set name [file rootname [file tail $line]]
+			if {[dict exists $ret $name]} {
+				set ret($name) -1
+			} else {
+				set size [lindex [split $line " "] 6]
+				set ret($name) $size
+			}
+		}
 	}
+	return $ret
+}
 
-	incr seen($name)
+set play 0
+set rec 0
+set seen {}
+set output {}
 
-	lappend output "<img class=va src=/images/$icon><span class=va>
-	    $mode&nbsp;$name</span><br>"
+if {$type eq "full"} {
+	set data [get_data]
+} else {
+	set data {}
+}
+
+if {[llength $data]} {
+	sleep 3
+	set ndata [get_data]
+	foreach name [array names ndata] {
+		if {![dict exists $seen $name]} { set seen($name) 0 }
+		if {![dict exists $data $name]} { set data($name) 0 }
+		if {[file exists "/mod/tmp/webif_auto/decrypting.$name.ts"]} {
+			set mode "Decrypting"
+			set icon "178_1_00_Icon_Lock.png style=\"padding: 0 0.2em 0 0.5em\""
+		} elseif {$ndata($name) == -1} {
+			incr rec
+			incr play
+			set mode "Chase Playing"
+			set icon "745_1_11_Video_3REC_Live.png"
+		} elseif {$ndata($name) > $data($name) && $seen($name) < 1} {
+			incr rec
+			set mode "Recording"
+			set icon "745_1_11_Video_1REC.png"
+		} else {
+			incr play
+			set mode "Playing"
+			set icon "745_1_10_Video_2Live.png"
+		}
+
+		incr seen($name)
+
+		if {$runmode eq "cgi"} {
+			lappend output [concat \
+			    "<span class=\"va stitem\">\n" \
+			    "  <img class=va src=/images/$icon>\n" \
+			    "  <span>$mode&nbsp;<i>$name</i></span>\n" \
+			    "</span>\n" \
+			    ]
+		} else {
+			lappend output "$mode $name"
+		}
+	}
+}
+
+if {![system instandby] && $play < 1} {
+	set hsvc [system param CUR_SVC Value USERCONFIG]
+
+	set ff [$rsvdb query "
+		select usSvcid as svcid, usLcn as lcn,
+		substr(szSvcName, 2) as name
+		from channel.TBL_SVC
+		where hSvc = $hsvc
+		limit 1
+	"]
+
+	if {[llength $ff] == 1} {
+		lassign [lindex $ff 0] x svcid x lcn x name
+		set epgs [epg dbfetch get \
+		    -service $svcid \
+		    -time [clock seconds]\
+		]
+		set prog ""
+		if {[llength $epgs] == 1} {
+			lassign $epgs epg
+			set prog "- [$epg get name] ("
+			append prog "[clock format [$epg get start] -format %H:%M] - "
+			append prog "[clock format $([$epg get start] + [$epg get duration]) -format %H:%M]"
+			append prog ") \[[$epg percent]%\]"
+		}
+
+		if {$runmode eq "cgi"} {
+			lappend output [concat \
+			    "<span class=\"va stitem\">\n" \
+			    "  [epg channelicon $name 30 \
+			    {vertical-align: middle; padding: 0 4px 0 2px}]\n" \
+			    "  <span>Watching <i>$lcn: $name $prog</i></span>\n" \
+			    "</span>\n" \
+			    ]
+		} else {
+			lappend output "Watching $lcn: $name $prog"
+		}
+	}
+}
+
+if {[system instandby]} {
+	if {$runmode eq "cgi"} {
+		lappend output [concat \
+		    "<span class=\"va stitem\">\n" \
+		    "  <img class=va width=28 style=\"padding: 0 4px\"" \
+		    "src=/img/standby.png>\n" \
+		    "  <span>System is in standby.</span>\n" \
+		    "</span>" \
+		]
+	} else {
+		lappend output "System is in standby."
+	}
+}
+
+set events [rsv list tbl_reservation \
+    " where ersvtype = 3 and nsttime - [clock seconds] < $schedtime 
+      and nsttime > [clock seconds] "]
+foreach event $events {
+	if {$runmode eq "cgi"} {
+		set icon "175_1_11_Reservation_Record.png"
+		lappend output [concat \
+		    "<span class=\"va stitem\">\n" \
+		    "  <img class=va src=/images/$icon width=20>\n" \
+		    "  <span>Will record <i>[$event name]</i>" \
+		    " on [$event channel_name] at"\
+		    " [clock format [$event get nsttime] -format {%H:%M}]" \
+		    "  </span>\n" \
+		    "</span>\n" \
+	} else {
+		lappend output [concat \
+		    "Will record '[$event name]' " \
+		    "on [$event channel_name] at " \
+		    "[clock format [$event get nsttime] -format {%H:%M}]" \
+		]
+	}
 }
 
 if {[llength $output]} {
-	puts [join $output " "]
+	if {$runmode eq "cgi"} {
+		puts [join $output "\n<br>\n"]
+	} else {
+		puts [join $output "\n"]
+	}
 }
 

var/mongoose/cgi-bin/transmission.jim

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

var/mongoose/cgi-bin/xepg.jim

@@ -1,37 +1,38 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 
-puts "Content-Type: text/html"
-puts ""
 header
 
 require epg.class spinner.class altrow epg_search totop
 
-cgi_input
-
-puts {<link type="text/css" href="/css/xepg.css" rel="Stylesheet" />}
+puts {
+<link type="text/css" href="/css/xepg.css" rel="Stylesheet" />
+<script type=text/javascript src=/js/enadis.js></script>
+}
 
 [spinner new {
-	text "Loading Now/Next Information..."
+	text "Loading EPG Information..."
 	size "1.2em"
 	style "margin: 1em;"
 	}] start
 
 require epg_popup
 
-set stt [cgi_get stt [clock seconds]]
-if {$stt <= [clock seconds]} {
-	set stt [clock seconds]
+set now [clock seconds]
+set stt [cgi_get stt $now]
+if {$stt <= $now} {
+	set stt $now
 	set current 1
 } else {
 	set current 0
 }
 
-set favlist [epg favlist]
+set favgroup [[settings] channel_group]
 
-set hours 4.0
+set hours [expr 1.0 * [[settings] xepghours]]
+if {$hours == 0} { set hours 4.0 }
 set seconds $($hours * 3600)
 
 set ostt $stt
@@ -40,7 +41,7 @@ set stt [expr int($stt / 1800.0) * 1800]
 set ett $(int($stt + $seconds))
 set offset $(($ostt - $stt) / 1800.0)
 
-set chanpx 120
+set chanpx 160
 set eventpx 1000
 set totalpx $($chanpx + $eventpx)
 set contwidth $($totalpx + 50)
@@ -51,28 +52,55 @@ set secpx $($minpx / 60.0)
 
 set start [clock milliseconds]
 if {$::qepg} {
-	set records [epg dbfetch dump -trange "$stt:$ett"]
+	if {$favgroup} {
+		set records [epg dbfetch dump \
+		    -trange "$stt:$ett" -fav $favgroup]
+	} else {
+		set records [epg dbfetch dump -trange "$stt:$ett"]
+	}
+
 } else {
 	require channelsort
 	set records [channelsort [epg fetch dump -trange "$stt:$ett"]]
 }
 set got [clock milliseconds]
 
-puts "<div id=buttons style=\"width: $eventpx; margin-left: ${chanpx}px;\">"
-if {$stt > [clock seconds]} {
-	puts "<button id=earlier>&lt;&lt;&lt; Earlier</button>"
+proc but {label time {active 1}} {
+	puts -nonewline "<button style=\"margin-right: 2em\" tt=$time"
+	if {$active} {
+		puts -nonewline " class=nav"
+	} else {
+		puts -nonewline " disabled class=\"nav ui-state-disabled\""
+	}
+	puts " active=$active>$label</button>"
 }
-puts "<button id=later>Later &gt;&gt;&gt;</button>"
+
+puts "<!-- Hours $hours ($seconds) -->"
+puts "<div id=buttons style=\"width: $eventpx; margin-left: ${chanpx}px;\">"
+
+but "&lt&lt; -1 Week" $($stt - 3600 * 24 * 7) \
+    $($stt - $now + 3600 >= 3600 * 24 * 7)
+but "&lt&lt; -1 Day" $($stt - 3600 * 24) $($stt - $now >= 3600 * 23)
+but "&lt;&lt; Earlier", $($stt - 3600 * 4) $($stt > $now)
+but "&lt; Now &gt;" $now $($current == 0)
+but "&gt;&gt; Later" $ett;
+but "&gt;&gt; +1 Day" $($stt + 3600 * 24) $($stt < $now + 8 * 3600 * 24)
+but "&gt;&gt; +1 Week" $($stt + 3600 * 24 * 7) $($stt < $now + 8 * 3600 * 24)
+
 puts "</div>"
 
 puts "
+<script type=text/javascript>
+\$('button.nav').button();
+</script>
 <div id=xepg style=\"min-width: ${contwidth}px; overflow: auto\">
 <div id=xepgnow></div>
 <div id=xegrid>
 "
 
 puts "<div id=epgdate style=\"width: ${eventpx}px; margin-left: ${chanpx}px;\">"
-puts [clock format $stt -format {%a %D}]
+puts [clock format $stt -format {%a %d/%m/%Y}]
+puts "<input type=hidden id=xepg_dp stt=$stt>"
 puts "</div>"
 
 puts "<div class=xechan style=\"width: ${chanpx}px;\">&nbsp;</div>"
@@ -87,9 +115,6 @@ set lcn 0
 set bg "odd"
 
 foreach e $records {
-	if {$favlist != "" && [$e get service_id] ni $favlist} {
-		continue
-	}
 	set chnum [$e get channel_num]
 	if {$chnum == 0} { continue }
 
@@ -170,6 +195,9 @@ puts "
 	Switch to standard now/next display.
 </button></small>
 </div>
+"
+
+puts "
 
 <script type=text/javascript>
 \$(document).ready(function() {
@@ -177,12 +205,37 @@ puts "
 \$('#epgswitch').button().click(function() {
 	window.location = '/epg.shtml';
 });
-\$('#earlier').button().click(function() {
-	window.location = '/cgi-bin/xepg.jim?stt=$earlier';
+
+\$('button.nav').click(function() {
+        window.location = '/cgi-bin/xepg.jim?stt=' + \$(this).attr('tt') +
+            '&pos=' + \$('#xegrid').scrollTop();
 });
-\$('#later').button().click(function() {
-	window.location = '/cgi-bin/xepg.jim?stt=$ett';
+
+\$('#xepg_dp').datepicker({
+        buttonImage: '/img/cal.gif',
+        buttonImageOnly: true,
+        showOn: 'button',
+        dateFormat: '@',
+        minDate: '[expr $now * 1000]',
+        maxDate: '[expr ($now + 7 * 86400) * 1000]',
+        onSelect: function(val, sel) {
+                var stt = \$(this).attr('stt');
+                // Extract date part
+                dval  = ~~(val / 86400000);
+                // Extract current time part
+                var tm = ~~(stt % 86400);
+
+                var ret = dval * 86400 + tm;
+
+                window.location = '/cgi-bin/xepg.jim?stt=' + ret;
+        }
 });
+
+\$('img.ui-datepicker-trigger').hover(
+    function() { \$(this).css('cursor', 'pointer'); },
+    function() { \$(this).css('cursor', 'auto'); }
+);
+
 "
 
 if {$current} {
@@ -218,12 +271,12 @@ puts "
 	</a><br>
 "
 
+epg cleanup
+
 set end [clock milliseconds]
 puts "<font class=footnote>
     Retrieved in: [expr [expr $got - $start] / 1000.0] seconds.
     </font>"
 
-epg cleanup
-
 footer
 

var/mongoose/html/backup.shtml

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

var/mongoose/html/browse/aexpiry.jim

@@ -0,0 +1,24 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+
+httpheader
+
+# dir=%2Fmedia%2FMy+Video%2FWeatherview
+# aexpiry_days=13
+
+set dir [cgi_get dir "-"]
+set days [cgi_get aexpiry_days 7]
+if {$dir eq "-"} exit
+
+if {![file isdirectory $dir]} {
+	puts "Not a directory."
+	exit
+}
+
+set fd [open "$dir/.autoexpire" w]
+puts $fd $days
+$fd close
+puts "Ok."
+

var/mongoose/html/browse/assets.jim

@@ -0,0 +1,282 @@
+#!/mod/bin/jimsh
+
+puts {
+
+<div id=jbar></div>
+
+<ul id=optmenu class=contextMenu style="width: 160px">
+	<li class=delete><a href=#delete>Delete</a></li>
+	<li class=cut><a href=#cut>Cut to clipboard</a></li>
+	<li class=pwcopy><a href=#copy>Copy to clipboard</a></li>
+
+	<li class=separator><a href=#rename>Rename</a></li>
+	<li><a href=#download>Download</a></li>
+
+}
+if {$model eq "HDR"} {
+	puts { <li class="separator decrypt"><a href=#decrypt>Decrypt</a></li> }
+	puts { <li class="compress"><a href=#strip>Shrink</a></li> }
+} else {
+	puts { <li class="compress separator"><a href=#strip>Shrink</a></li> }
+}
+if {[system pkginst ffmpeg]} {
+	puts {
+		<li><a href=#audio>Extract Audio</a></li>
+		<li><a href=#mpg>Extract to MPG</a></li>
+	}
+}
+if $nicesplice {
+	puts {
+		<li class="cut"><a href=#crop>Crop</a></li>
+		<li class="cut"><a href=#chunk>Split (45m parts)</a></li>
+	}
+}
+puts {
+	<li class=separator><a href=#lock>Toggle Lock</a></li>
+	<li><a href=#new>Toggle New</a></li>
+</ul>
+
+<ul id=ooptmenu class=contextMenu style="width: 160px">
+	<li class=delete><a href=#delete>Delete</a></li>
+	<li class=cut><a href=#cut>Cut to clipboard</a></li>
+	<li class=pwcopy><a href=#copy>Copy to clipboard</a></li>
+
+	<li class=separator><a href=#rename>Rename</a></li>
+	<li><a href=#download>Download</a></li>
+</ul>
+
+<ul id=dooptmenu class=contextMenu style="width: 250px">
+	<li class=delete><a href=#delete>Delete</a></li>
+	<li class=cut><a href=#cut>Cut to clipboard</a></li>
+	<li class=pwcopy><a href=#copy>Copy to clipboard</a></li>
+	<li class=pwpaste><a href=#paste>Paste to folder</a></li>
+	<li class=separator><a href=#rename>Rename</a></li>
+</ul>
+
+<ul id=doptmenu class=contextMenu style="width: 250px">
+	<li class=delete><a href=#delete>Delete</a></li>
+	<li class=cut><a href=#cut>Cut to clipboard</a></li>
+	<li class=pwcopy><a href=#copy>Copy to clipboard</a></li>
+	<li class=pwpaste><a href=#paste>Paste to folder</a></li>
+	<li class=separator><a href=#rename>Rename</a></li>
+	<li class=separator><a href=#resetnew>Reset new flag</a></li>
+	<li class="separator compress"><a href=#shrink>Auto-Shrink</a></li>
+	<li class="compressr"><a href=#shrinkr>Recursive Auto-Shrink</a></li>
+	<li class=dedup><a href=#dedup>Auto-Dedup</a></li>
+}
+if {$model eq "HDR"} {
+	puts {
+		<li class=decrypt><a href=#decrypt>Auto-Decrypt</a></li>
+		<li class=decryptr><a href=#decryptr>Recursive Auto-Decrypt
+		    </a></li>
+	}
+}
+if $flatten {
+	puts { <li class="separator"><a href=#flat>No-Flatten</a></li> }
+}
+
+puts {
+	<li class=clock><a href=#expire>Auto-Expire</a></li>
+	<li class=mpg><a href=#mpg>Auto-MPG Extract</a></li>
+</ul>
+
+<div id=renameform title="Rename media file" style="display: none">
+	<form id=renameform_form>
+	<input type=hidden name="renamefile" id="renamefile" value="">
+	<table border=0>
+	<tr>
+	<th>
+		<label for="rename">
+			<b>New Filename</b>
+		</label>
+	</th>
+	<td>
+		<input type=text name="rename" id="rename"
+		    value="" size=70 maxlength=255
+		    class="text ui-widget-content ui-corner-all">
+	</td>
+	</tr>
+
+	<tr style="display: none" class=tstype>
+	<th>
+		<label for="rename_title" style="padding-top: 0.5em">
+			<b>New Medialist Title</b>
+		</label>
+	</th>
+	<td>
+		<input type=text name="rename_title" id="rename_title"
+		    value="" size=70 maxlength=48
+		    class="text ui-widget-content ui-corner-all">
+	</td>
+	</tr>
+
+	<tr style="display: none" class=tstype>
+	<th>
+		<label for="rename_synopsis" style="padding-top: 0.5em">
+			<b>New Synopsis</b>
+		</label>
+	</th>
+	<td>
+		<textarea name="rename_synopsis" id="rename_synopsis"
+		    value="" cols=70 rows=4
+		    class="text ui-widget-content ui-corner-all"></textarea>
+	</td>
+	</tr>
+
+	<tr style="display: none" class=tstype>
+	<th>
+		<label for="rename_guidance" style="padding-top: 0.5em">
+			<b>New Guidance Text</b>
+		</label>
+	</th>
+	<td>
+		<input type=text name="rename_guidance" id="rename_guidance"
+		    value="" size=70 maxlength=74
+		    class="text ui-widget-content ui-corner-all">
+	</td>
+	</tr>
+
+	<tr style="display: none" class=tstype>
+	<th>
+		<label for="rename_genre" style="padding-top: 0.5em">
+			<b>New Genre</b>
+		</label>
+	</th>
+	<td>
+		<select name="rename_genre" id="rename_genre"
+		    style="vertical-align: middle"
+		    class="text ui-widget-content ui-corner-all">
+}
+
+set glist [ts genrelist]
+foreach genre [array names glist] {
+	lassign $glist($genre) txt img
+	if {$img eq "Unclassified"} {
+		set img /images/173_3_26_G3_$img.png
+	} else {
+		set img /images/173_3_00_G3_$img.png
+	}
+	puts "<option value=$genre style=\"
+	    background: url($img) no-repeat left;
+	    padding: 8px 0 8px 30px;
+	    vertical-align: middle;
+	    \" onclick=\"this.parentNode.setAttribute('style',
+            this.getAttribute('style'));\">$txt"
+}
+
+puts {
+		</select>
+	</td>
+	</tr>
+
+	</table>
+	</form>
+</div>
+
+<div id=drenameform title="Rename directory" style="display: none">
+	<form id=drenameform_form>
+	<input type=hidden name="renamefile" id="drenameorig" value="">
+	<table border=0>
+	<tr>
+	<th>
+		<label for="drename">
+			<b>New Directory Name</b>
+		</label>
+	</th>
+	<td>
+		<input type=text name="rename" id="drename"
+		    value="" size=70 maxlength=255
+		    class="text ui-widget-content ui-corner-all">
+	</td>
+	</tr>
+	</table>
+	</form>
+</div>
+
+<div id=savestreamform title="Save streamed content"
+    style="display: none">
+	<div class=pre id=savestream_detail></div>
+	<form id=savestream_form>
+}
+puts "<input type=hidden name=dir value=\"$dir\">"
+puts {
+	<table border=0>
+	<tr>
+	<th>
+		<label for="savestream_name">
+			<b>Filename</b>
+		</label>
+	</th>
+	<td>
+		<input type=text name="savestream_name"
+		    id="savestream_name"
+		    value="" size=70 maxlength=255
+		    class="text ui-widget-content ui-corner-all">
+		<img id=savestream_spin src=/img/loading.gif>
+	</td>
+	</tr>
+	</table>
+	</form>
+</div>
+
+<div id=newdirform title="New Folder" style="display: none">
+	<form id=newdirform_form>
+}
+puts "<input type=hidden name=dir value=\"$dir\">"
+puts {
+	<table border=0>
+	<tr>
+	<th>
+		<label for="newdirname">
+			<b>New Folder Name</b>
+		</label>
+	</th>
+	<td>
+		<input type=text name="newdirname" id="newdirname"
+		    value="" size=70 maxlength=255
+		    class="text ui-widget-content ui-corner-all">
+	</td>
+	</tr>
+	</table>
+	</form>
+</div>
+
+<div id=aexpiry title="Auto-Expiry" style="display: none">
+	<form id=aexpiry_form>
+	<input type=hidden name="dir" id="aexpiry_ldir" value="">
+}
+puts {
+	<table border=0>
+	<tr>
+	<th>
+		<label for="aexpiry_days">
+			<b>Expire after</b>
+			<span class=blood>(in days)</span>
+		</label>
+	</th>
+	<td>
+		<input type=text name="aexpiry_days" id="aexpiry_days"
+		    type=number value=0 size=5 maxlength=3
+		    class="text ui-widget-content ui-corner-all">
+	</td>
+	</tr>
+	</table>
+	<div id=aexpiry_working class=hidden>
+		<img src=/img/loading.gif> Applying auto-expiry...
+	</div>
+	</form>
+</div>
+
+<div id=dialogue></div>
+<div id=confirm title="Confirmation Required"></div>
+<div id=pwdialogue style="display: none">
+<center>
+<img src=/img/loading.gif>
+<br><br>
+Please wait...
+<div id=pwfeedback></div>
+</center>
+</div>
+
+}
+

var/mongoose/html/browse/audio/audio.jim

@@ -2,21 +2,16 @@
 
 package require sqlite3
 package require cgi
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 require ts.class system.class
 
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
+header
 
 set rfile [cgi_get file]
 set ts [ts fetch $rfile]
 set dir [file dirname $rfile]
 set len [$ts duration 1]
 
-header
-
 puts "
 <link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
 <script type=text/javascript src=/js/jquery.progressbar.js></script>

var/mongoose/html/browse/audio/audio.js

@@ -15,7 +15,7 @@ $(document).ready(function() {
 $('#progressbar').reportprogress(0);
 
 $('#back').button().click(function() {
-	window.location = '/cgi-bin/browse.jim?dir=' + $('#params').attr('dir');
+	window.location = '../index.jim?dir=' + $('#params').attr('dir');
 });
 
 $('#audioit').button().click(function() {

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

@@ -2,13 +2,10 @@
 
 package require sqlite3
 package require cgi
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 require ts.class system.class
 
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
+httpheader
 
 set rfile [cgi_get file]
 set ts [ts fetch $rfile]

var/mongoose/html/browse/audio/progress.jim

@@ -1,13 +1,10 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 require ts.class
 
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
+httpheader
 
 set tsfile [cgi_get file]
 set rfile [file normalize $tsfile]

var/mongoose/html/browse/chunk/chunk.jim

@@ -1,13 +1,10 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 require ts.class pretty_size
 
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
+header
 
 set rfile [cgi_get file]
 set ts [ts fetch $rfile]
@@ -21,8 +18,6 @@ set len [$ts duration 1]
 set esttime $(int($len * 0.025))
 if {[$ts get definition] eq "HD"} { set esttime $($esttime * 4) }
 
-header
-
 puts "
 <script type=text/javascript src=/js/jquery.progressbar.js></script>
 <script type=text/javascript src=chunk.js></script>

var/mongoose/html/browse/chunk/chunk.js

@@ -69,7 +69,7 @@ $('#back').button().click(function(e) {
 	e.preventDefault();
 	var dir = $(this).attr('dir');
 
-	window.location = '/cgi-bin/browse.jim?dir=' + dir;
+	window.location = '../index.jim?dir=' + dir;
 });
 
 });

var/mongoose/html/browse/chunk/extract.jim

@@ -1,13 +1,10 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 require ts.class pretty_size
 
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
+httpheader
 
 set rfile [cgi_get file]
 set part [cgi_get part -]

var/mongoose/html/browse/chunk/progress.jim

@@ -1,13 +1,10 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 require ts.class
 
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
+heepheader
 
 set file [cgi_get file]
 set part [cgi_get part]

var/mongoose/html/browse/clipboard.jim

@@ -1,16 +1,12 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 require clipboard.class ts.class
 
-puts "Content-Type: text/html; no-cache"
-puts "Expires: Thu, 01 Jan 1970 00:00:00 GMT"
-puts "Pragma: nocache"
-puts ""
+httpheader
 
 cgi_input 1
-#cgi_dump
 
 set cb [[clipboard new {path "/tmp/webif-browse.cb"}] load]
 
@@ -59,7 +55,7 @@ switch $action {
 	set mode [cgi_get mode copy]
 	foreach p $path {
 		set p [cgi_unquote_input $p]
-		if {$dir ne "0" && ![string match "$dir/*" $p]} {
+		if {$dir ne "0" && [string first "$dir/" $p] != 0} {
 			puts "$p not in directory<br>"
 			continue
 		}
@@ -95,21 +91,27 @@ switch $action {
 				catch {puts [exec /mod/bin/busybox/cp -r \
 				    $path $dir]}
 			}
-		} else {
-			set root [file rootname $path]
-			# Protect special characters in root.
-			# In particular [] characters which are used a lot
-			# for torrent names.
-			regsub -all {([\\["$])} $root {\\\1} root
-			foreach f [glob -nocomplain "${root}.*"] {
-				if {$mode eq "cut"} {
-					catch {file rename $f \
-					    "$dir/[file tail $f]"}
-				} else {
-					catch {file copy $f \
-					    "$dir/[file tail $f]"}
+		} elseif {[string match {*.ts} $path]} {
+			set ts [ts fetch $path]
+			if {![catch {$ts get file}]} {
+				foreach f [$ts fileset] {
+					if {$mode eq "cut"} {
+						catch {file rename $f \
+						    "$dir/[file tail $f]"}
+					} else {
+						catch {file copy $f \
+						    "$dir/[file tail $f]"}
+					}
 				}
 			}
+		} else {
+			if {$mode eq "cut"} {
+				catch {file rename $path \
+				    "$dir/[file tail $path]"}
+			} else {
+				catch {file copy $path \
+				    "$dir/[file tail $path]"}
+			}
 		}
 	}
 	$cb clear

var/mongoose/html/browse/crop/crop.jim

@@ -1,13 +1,10 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 require ts.class pretty_size
 
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
+header
 
 set rfile [cgi_get file]
 set ts [ts fetch $rfile]
@@ -15,8 +12,6 @@ set dir [file dirname $rfile]
 
 set len [$ts duration 1]
 
-header
-
 puts "
 <link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
 <script type=text/javascript src=/js/jquery.progressbar.js></script>

var/mongoose/html/browse/crop/crop.js

@@ -17,7 +17,7 @@ $(document).ready(function() {
 $('#progressbar').reportprogress(0);
 
 $('#back').button().click(function() {
-	window.location = '/cgi-bin/browse.jim?dir=' + $('#params').attr('dir');
+	window.location = '../index.jim?dir=' + $('#params').attr('dir');
 });
 
 $('#cropit').button().click(function() {

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

@@ -1,15 +1,18 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/setup
-require ts.class pretty_size
+source /mod/webif/lib/setup
+require ts.class pretty_size system.class
 
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
+httpheader
 
 set rfile [cgi_get file]
+
+if {[system inuse $rfile]} {
+	puts "This file is in use. Cannot process at the moment."
+	exit
+}
+
 set ts [ts fetch $rfile]
 set dir [file dirname $rfile]
 

var/mongoose/html/browse/crop/progress.jim

@@ -1,13 +1,10 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 require ts.class
 
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
+httpheader
 
 set perc [cgi_get perc 100]
 set tsfile [file normalize [cgi_get file]]

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

@@ -2,13 +2,10 @@
 
 package require sqlite3
 package require cgi
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 require ts.class
 
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
+header
 
 set rfile [cgi_get file]
 set ts [ts fetch $rfile]
@@ -16,8 +13,6 @@ set dir [file dirname $rfile]
 set len [$ts duration 1]
 lassign [$ts dlnaloc] url
 
-header
-
 puts "
 <link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
 <script type=text/javascript src=/js/jquery.progressbar.js></script>

var/mongoose/html/browse/decrypt/decrypt.js

@@ -15,7 +15,7 @@ $(document).ready(function() {
 $('#progressbar').reportprogress(0);
 
 $('#back').button().click(function() {
-	window.location = '/cgi-bin/browse.jim?dir=' + $('#params').attr('dir');
+	window.location = '../index.jim?dir=' + $('#params').attr('dir');
 });
 
 $('#decryptit').button().click(function() {

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

@@ -2,13 +2,10 @@
 
 package require sqlite3
 package require cgi
-source /mod/var/mongoose/lib/setup
-require ts.class
+source /mod/webif/lib/setup
+require ts.class system.class
 
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
+httpheader
 
 set rfile [cgi_get file]
 set ts [ts fetch $rfile]
@@ -22,6 +19,11 @@ if {$url eq ""} {
 	exit
 }
 
+if {[system inuse $rfile]} {
+	puts "This file is in use. Cannot decrypt at the moment."
+	exit
+}
+
 set xstart [clock milliseconds]
 
 set base [file rootname $rfile]

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

@@ -1,13 +1,10 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 require ts.class
 
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
+httpheader
 
 set tsfile [cgi_get file]
 set rfile [file normalize $tsfile]

var/mongoose/html/browse/delete.jim

@@ -0,0 +1,33 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+require safe_delete
+
+httpheader
+
+set dir [cgi_get dir]
+
+#puts "DIR: ($dir)"
+
+puts "<div id=deleting class=blood><img src=/img/loading.gif>Deleting...</div>"
+puts "<ul style=\"list-style-type: square\">"
+
+foreach file [cgi_get files] {
+	puts -nonewline "<li>\"$file\"..."
+
+	if {[string first "$dir/" $file] != 0} {
+		puts "Error - outside directory."
+		continue
+	}
+
+	if {[safe_delete $file]} {
+		puts -nonewline "Done..."
+	} else {
+		puts -nonewline "Error..."
+	}
+
+	puts "</li>"
+}
+puts "</ul>"
+

var/mongoose/html/browse/download.jim

@@ -2,15 +2,11 @@
 
 package require cgi
 package require sqlite3
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 require ts.class
 
-#puts "Content-Type: text/plain\r\n\r\n"
-
-cgi_input
-#cgi_dump
-
 set file [cgi_get file]
+set urlbase [cgi_get base ""]
 
 # Default to just downloading the raw file.
 set url $file
@@ -22,7 +18,7 @@ if {[string match {*.ts} $file]} {
 		# If it's encrypted on disk and the DLNA option is available,
 		# then use the server to perform decryption on the fly.
 		if {[$ts flag "ODEncrypted"] > 0} {
-			set dlna [$ts dlnaloc]
+			set dlna [$ts dlnaloc $urlbase]
 			if {[llength $dlna]} { lassign $dlna url mime }
 
 			#puts "DLNA: $dlna"

var/mongoose/html/browse/enc.jim

@@ -1,17 +1,12 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/ts.class
+source /mod/webif/lib/setup
+require ts.class
 
-puts "Content-Type: text/html"
-puts ""
+httpheader
 
-cgi_input
-#cgi_dump
-
-#set _cgi(file) "/media/My Video/The Walking Dead/The Walking Dead S01E06.ts"
-
-set file [dict get $_cgi file]
+set file [cgi_get file]
 set ts [ts fetch $file]
 if {[set ts [ts fetch $file]] != 0} {
 	set action enc

var/mongoose/html/browse/epgtitle.jim

@@ -0,0 +1,19 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+require ts.class
+
+httpheader "application/json"
+
+set file [cgi_get file]
+if {$file == 0} exit
+set ts [ts fetch $file]
+
+puts "{"
+puts "\"title\" : \"[$ts get title]\","
+puts "\"synopsis\" : \"[$ts get synopsis]\","
+puts "\"guidance\" : \"[$ts get guidance]\","
+puts "\"genre\" : [$ts get genre]"
+puts "}"
+

var/mongoose/html/browse/ffmpeg.jim

@@ -0,0 +1,14 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+
+httpheader
+
+if [file exists /mod/bin/ffmpeg] {
+	set file [cgi_get file]
+	puts [exec /mod/webif/lib/bin/ffmpeg -i $file]
+} else {
+	puts "Install ffmpeg package for more information..."
+}
+

var/mongoose/html/browse/file.jim

@@ -1,27 +1,21 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/pretty_size
+source /mod/webif/lib/setup
+require pretty_size
 
-puts "Content-Type: text/html"
-puts ""
+httpheader
 
-cgi_input
-#cgi_dump
+set file [cgi_get file]
+set type [cgi_get type]
 
-#set _cgi(file) "/media/My Video/Dangermouse/Series 1/01_rogue_robots.avi"
-
-if {![dict exists $_cgi file]} { exit }
-
-set file [dict get $_cgi file]
-set type [dict get $_cgi type]
+if {$file == 0} exit
 
 file stat $file st
 set sz [pretty_size $st(size)]
 
 if {$type eq "ts"} {
-	source /mod/var/mongoose/lib/epg.class
-	source /mod/var/mongoose/lib/ts.class
+	require epg.class ts.class
 
 	set ts [ts fetch $file]
 
@@ -91,6 +85,23 @@ if {$url ne ""} {
 	   <td><a href=\"$url\">$url</a></td>"
 }
 puts "
+</tr><tr>
+	<th>Files</th>
+	<td>
+"
+
+set fileset [$ts fileset]
+puts -nonewline "<img id=xfileset class=va src=/img/tree/plusonly.png>"
+puts -nonewline "[llength $fileset] file"
+if {[llength $fileset] != 1} { puts -nonewline "s" }
+puts -nonewline " in set."
+puts "<div id=fileset class=hidden><ul>"
+foreach f $fileset {
+	puts "<li>[file tail $f] ([pretty_size [file size $f]])</li>" 
+}
+puts "</ul></div>"
+
+puts "</td>
 </tr><tr>
 	<th>Flags</th>
 	<td>[$ts get flags]
@@ -101,6 +112,18 @@ if {[$ts get bookmarks]} {
 
 	puts "</tr>"
 	puts "</table>"
+	puts {
+<script type=text/javascript>
+$('#xfileset').click(function() {
+	$('#fileset').slideToggle('slow', function() {
+		if ($('#fileset').is(':visible'))
+			$('#xfileset').attr('src', '/img/tree/minustop.png');
+		else
+			$('#xfileset').attr('src', '/img/tree/plusonly.png');
+	});
+});
+</script>
+	}
 	exit
 }
 
@@ -123,7 +146,7 @@ puts "
 </table>
 "
 
-set url "/cgi-bin/browse/ffmpeg.jim?file=[cgi_quote_url $file]"
+set url "/bin/browse/ffmpeg.jim?file=[cgi_quote_url $file]"
 puts { <script type="text/javascript"> }
 puts "var url = \"$url\";"
 puts {

var/mongoose/html/browse/flagdir.jim

@@ -0,0 +1,18 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+
+httpheader
+
+set dir [cgi_get dir]
+set flag [cgi_get flag]
+if {![file isdirectory $dir]} { exit }
+if {[file exists "$dir/.$flag"]} {
+	file delete "$dir/.$flag"
+	puts "Unflagged directory as $flag."
+} else {
+	close [open "$dir/.$flag" w]
+	puts "Flagged directory as $flag."
+}
+

var/mongoose/html/browse/iconset.jim

@@ -0,0 +1,14 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+require browse.class
+
+httpheader
+
+set file [cgi_get file]
+
+if {[file isdirectory $file]} {
+	lassign [{dir iconset} $file] icons #attrs
+	puts [join $icons ""]
+}

var/mongoose/html/browse/index.jim

@@ -1,11 +1,10 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/setup
-require ts.class pretty_size system.class settings.class escape
+source /mod/webif/lib/setup
+require ts.class pretty_size system.class settings.class escape browse.class
 
-puts "Content-Type: text/html"
-puts ""
+header
 
 set nicesplice [system pkginst nicesplice]
 set flatten [system pkginst flatten]
@@ -13,11 +12,9 @@ set flatten [system pkginst flatten]
 set ignore {.nts .thm .hmi}
 set include {.ts .avi .mpg .mpeg .wmv .mkv .mp3 .mp4 .mov .hmt}
 
-cgi_input
-#cgi_dump
-
 if {![dict exists $env REQUEST_URI]} {
 	set env(REQUEST_URI) ""
+	cgi_input
 	set _cgi(dir) "/media/My Video/"
 }
 
@@ -33,18 +30,15 @@ if {$order eq "-"} {
 set model [system model]
 set dustbin [system dustbin 1]
 
-proc icon {img {hover ""} {extra ""}} {
-	puts -nonewline "<img src=$img class=va height=21 $extra"
+proc icon {img {hover ""} {extra ""} {class "va"}} {
+	puts -nonewline "<img src=$img class=\"$class\" height=21 $extra"
 	if {$hover ne ""} {
 		puts -nonewline " alt=\"$hover\" title=\"$hover\""
 	}
 	puts ">"
 }
 
-proc directory {file bfile} {
-	global flatten
-
-	regsub -all " +" $bfile "" tbfile
+proc directory {file bfile tbfile} {
 	puts "<div class=va>"
 	set img "/images/711_1_09_Media_Folder.png"
 	if {$bfile eq $::dustbin} { set img "/img/Dustbin_Folder.png" }
@@ -56,17 +50,22 @@ proc directory {file bfile} {
 	puts "$bfile</a><span class=filesize id=\"$tbfile\">
 		</span>"
 
-	set noflat 0
-	if $flatten {
-		if {[string match {\[*\]} [file tail $file]]} { set noflat 1 }
-		if {[file exists "$file/.noflatten"]} { set noflat 1 }
-		if $noflat { icon "/img/flat-tyre.png" "No-flatten" }
+	lassign [{dir iconset} $file] icons attrs
+
+	puts "<span class=iconset>"
+	puts [join $icons ""]
+	puts "</span>"
+
+	if {[string first $::mroot $file] >= 0} {
+		set class dopt
+	} else {
+		set class doopt
 	}
 
 	puts -nonewline "
 	      <a href=#>
-		<img class=\"dopt va\" border=0 width=45 "
-	if $flatten { puts -nonewline "noflat=$noflat " }
+		<img class=\"$class va\" border=0 width=45 "
+	puts -nonewline [join $attrs " "]
 	puts "
 		    src=/images/181_1_00_Help5_OPT_Plus.png>
 	      </a>
@@ -80,15 +79,16 @@ proc directory {file bfile} {
 
 proc entry {file} {{i 0}} {
 	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"] {
-		directory $file $bfile
-		continue
+		directory $file $bfile $tbfile
+		return
 	}
-	set ext [file extension $file]
-	if {$ext in $::ignore || $ext ni $::include} { continue }
+	set ext [string tolower [file extension $file]]
+	if {$ext in $::ignore || $ext ni $::include} { return }
 
 	file stat $file st
 	set rsz $st(size)
@@ -100,16 +100,19 @@ proc entry {file} {{i 0}} {
 		set type ts
 		set ts [ts fetch $file 1]
 		set img Video_TS
+		set omenu opt
 	} elseif {$ext eq ".hmt"} {
 		if {[file exists "${base}.ts"]} { continue }
 		# Sole hmt file indicates failure to track.
 		set type bad
 		set ts 0
 		set img Video_Failed
+		set omenu oopt
 	} else {
 		set type gen
 		set ts 0
 		set img Video_Other
+		set omenu oopt
 	}
 
 	set new 0
@@ -149,7 +152,22 @@ proc entry {file} {{i 0}} {
 	set def unknown
 	set bx 0
 	set dlna 0
+	set shrunk 0
 	if {$type eq "ts"} {
+		set genre [$ts get genre]
+		set glist [ts genrelist]
+		if {[dict exists $glist $genre]} {
+			set ret $glist($genre)
+		} else {
+			set ret $glist(0)
+		}
+		lassign $ret txt img
+		if {$img eq "Unclassified"} {
+			icon "/images/173_3_26_G3_$img.png" $txt
+		} else {
+			icon "/images/173_3_00_G3_$img.png" $txt
+		}
+
 		# HD / SD
 		if {[$ts get definition] eq "HD"} {
 			set def HD
@@ -187,6 +205,12 @@ proc entry {file} {{i 0}} {
 			set dlna 1
 		}
 
+		# Shrunk
+		if {[$ts flag Shrunk]} {
+			icon "/img/compress.png" "Shrunk"
+			set shrunk 1
+		}
+
 		set bx [$ts get bookmarks]
 	}
 
@@ -194,9 +218,9 @@ proc entry {file} {{i 0}} {
 
 	puts "
 	      <a href=#>
-		<img class=\"opt va\" border=0 width=45 type=$type did=$i
+		<img class=\"$omenu va\" border=0 width=45 type=$type did=$i
 		    locked=$locked encd=$encd def=$def new=$new bx=$bx
-		    rsize=$rsz
+		    shrunk=$shrunk rsize=$rsz
 		    odencd=$odencd dlna=$dlna
 		    src=/images/181_1_00_Help5_OPT_Plus.png>
 	      </a>
@@ -205,27 +229,27 @@ proc entry {file} {{i 0}} {
 	puts "</div>"
 }
 
-set dir [cgi_get dir [system mediaroot]]
+set mroot [system mediaroot]
+set dir [cgi_get dir $mroot]
 
 ######################################################################
 # Render web page
 
-header
-
 puts { 
 	<link href=/css/jquery.contextMenu.css rel=stylesheet type=text/css />
 	<script type=text/javascript src=/js/jquery.contextMenu.js></script>
 	<link href=/css/jquery.bar.css rel=stylesheet type=text/css />
 	<script type=text/javascript src=/js/jquery.bar.js></script>
 	<script type=text/javascript src=/js/enadis.js></script>
-	<script type=text/javascript src=/cgi-bin/browse/browse.js></script>
-	<link type=text/css rel=stylesheet href=/cgi-bin/browse/style.css />
+	<script type=text/javascript src=script.js></script>
+	<link type=text/css rel=stylesheet href=style.css />
 }
 
-source /mod/var/mongoose/cgi-bin/browse/assets.jim
+source assets.jim
 
 puts "
 	<span style=\"display:none\" id=dir>$dir</span>
+	<span style=\"display:none\" id=mediaroot>$mroot</span>
       <fieldset class=cleft style=\"margin: 0 1em 1em 1em\">
       <legend style=\"font-size: 1.5em; padding: 0 0.5em 0.5em 0.5em;\">
 "
@@ -269,9 +293,9 @@ proc s_time {a b} {
 		return 0
 	}
 
-	file stat $a l
+	if {[catch {file stat $a l}]} { return 0}
 	set at $l(ctime)
-	file stat $b l
+	if {[catch {file stat $b l}]} { return 0}
 	set bt $l(ctime)
 
 	if {$at < $bt} { return -1 }
@@ -354,6 +378,7 @@ if {[file exists /mnt/hd3/Streamer_down_file]} {
 		puts {
 	<button id=save_stream file=/mnt/hd3/Streamer_down_file>
 		Save last streamed content (e.g. iPlayer/YouTube)
+		<div id=streamstatus></div>
 	</button>
 	}
 }

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

@@ -1,13 +1,12 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 require ts.class pretty_size
 
-puts "Content-Type: text/html\r\n\r\n"
+httpheader
 
 cgi_input 1
-#cgi_dump
 
 set joinstart [clock milliseconds]
 

var/mongoose/html/browse/join/join.jim

@@ -1,10 +1,9 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 require ts.class pretty_size
 
-puts "Content-Type: text/html\r\n\r\n"
 header
 
 cgi_input 1

var/mongoose/html/browse/join/join.js

@@ -22,7 +22,7 @@ $(document).ready(function() {
 $('#progressbar').reportprogress(0);
 
 $('#back').button().click(function() {
-	window.location = '/cgi-bin/browse.jim?dir=' + $(this).attr('dir');
+	window.location = '../index.jim?dir=' + $(this).attr('dir');
 });
 
 $('#filelist').sortable().disableSelection();

var/mongoose/html/browse/join/progress.jim

@@ -1,12 +1,9 @@
 #!/mod/bin/jimsh
 
 package require cgi
-#source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
+httpheader
 
 set expected [cgi_get esize 1]
 set file [file normalize [cgi_get file]]

var/mongoose/html/browse/lock.jim

@@ -1,17 +1,12 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/ts.class
+source /mod/webif/lib/setup
+require ts.class
 
-puts "Content-Type: text/html"
-puts ""
+httpheader
 
-cgi_input
-#cgi_dump
-
-#set _cgi(file) "/media/My Video/The Walking Dead/The Walking Dead S01E06.ts"
-
-set file [dict get $_cgi file]
+set file [cgi_get file ""]
 set ts [ts fetch $file]
 if {[set ts [ts fetch $file]] != 0} {
 	set action lock

var/mongoose/html/browse/mknewdir.jim

@@ -1,12 +1,9 @@
 #!/mod/bin/jimsh
 
 package require cgi
+source /mod/webif/lib/setup
 
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
+httpheader
 
 set dir [cgi_get dir -]
 set name [cgi_get newdirname "New Folder"]

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

@@ -2,13 +2,10 @@
 
 package require sqlite3
 package require cgi
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 require ts.class system.class
 
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
+httpheader
 
 set rfile [cgi_get file]
 set ts [ts fetch $rfile]

var/mongoose/html/browse/mpg/mpg.jim

@@ -2,21 +2,16 @@
 
 package require sqlite3
 package require cgi
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 require ts.class system.class
 
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
+header
 
 set rfile [cgi_get file]
 set ts [ts fetch $rfile]
 set dir [file dirname $rfile]
 set len [$ts duration 1]
 
-header
-
 puts "
 <link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
 <script type=text/javascript src=/js/jquery.progressbar.js></script>

var/mongoose/html/browse/mpg/mpg.js

@@ -15,7 +15,7 @@ $(document).ready(function() {
 $('#progressbar').reportprogress(0);
 
 $('#back').button().click(function() {
-	window.location = '/cgi-bin/browse.jim?dir=' + $('#params').attr('dir');
+	window.location = '../index.jim?dir=' + $('#params').attr('dir');
 });
 
 $('#mpgit').button().click(function() {

var/mongoose/html/browse/mpg/progress.jim

@@ -1,13 +1,10 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 require ts.class
 
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
+httpheader
 
 set tsfile [cgi_get file]
 set rfile [file normalize $tsfile]

var/mongoose/html/browse/new.jim

@@ -1,17 +1,12 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/ts.class
+source /mod/webif/lib/setup
+require ts.class
 
-puts "Content-Type: text/html"
-puts ""
+httpheader
 
-cgi_input
-#cgi_dump
-
-#set _cgi(file) "/media/My Video/The Walking Dead/The Walking Dead S01E06.ts"
-
-set file [dict get $_cgi file]
+set file [cgi_get file]
 set ts [ts fetch $file]
 if {[set ts [ts fetch $file]] != 0} {
 	set action new

var/mongoose/html/browse/newdir.jim

@@ -2,16 +2,11 @@
 
 package require cgi
 package require pack
+source /mod/webif/lib/setup
 
-puts "Content-Type: application/json"
-puts ""
+httpheader "application/json"
 
-cgi_input
-#cgi_dump
-
-#set _cgi(dir) "/media/My Video"
-
-set root [dict get $_cgi dir]
+set root [cgi_get dir]
 # Strip double slashes
 regsub -all -- {\/+} "$root/*" "/" root
 

var/mongoose/html/browse/rename.jim

@@ -0,0 +1,48 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+require ts.class
+
+httpheader
+
+set file [cgi_get renamefile "-"]
+if {$file eq "-"} exit
+
+set newfile [string trim [cgi_get rename]]
+set dir [file dirname $file]
+
+if {[file isdirectory $file]} {
+	#puts "Directory."
+	if {$newfile ne ""} {
+		set newfile "${dir}/${newfile}"
+		file rename $file $newfile
+	}
+} elseif {[set ts [ts fetch $file]] != 0} {
+	#puts "TS file."
+
+	foreach attr {title synopsis guidance genre} {
+		if {[catch {
+			set new [string trim [cgi_get "rename_$attr"]]
+			set old [$ts get $attr]
+			if {$new ne $old} {
+				if {$attr eq "guidance" ||
+				    [string length $new] > 0} {
+					$ts set$attr $new
+				}
+			}
+		} msg]} {
+			puts "$attr: $msg"
+		}
+	}
+
+	if {"$dir/$newfile.ts" ne "$file"} { ts renamegroup $file $newfile }
+} else {
+	#puts "Normal file."
+	if {$newfile ne ""} {
+		set newfile "$dir/$newfile[file extension $file]"
+		puts "Rename ($file) -> ($newfile)"
+		file rename $file $newfile
+	}
+}
+

var/mongoose/html/browse/resetnew.jim

@@ -0,0 +1,45 @@
+#!/mod/bin/jimsh
+
+package require cgi
+package require pack
+source /mod/webif/lib/setup
+require ts.class hexdump
+
+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
+

var/mongoose/html/browse/savestream.jim

@@ -1,13 +1,10 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/ts.class
+source /mod/webif/lib/setup
+require ts.class
 
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
+httpheader
 
 set dir [cgi_get dir "/media/My Video"]
 set file [file tail [cgi_get savestream_name]]

var/mongoose/html/browse/script.js

@@ -6,36 +6,8 @@ function disableall()
 	$('button,a,input').disable();
 }
 
-function reloadclipboard()
+function pastedialogue()
 {
-	$('#clipboard')
-	    .empty()
-	    .html('<img src=/img/loading.gif> <i>Loading...</i>')
-	    .load('/cgi-bin/browse/clipboard.jim', function() {
-
-// Start Clipboard post-load actions
-
-if ($('#clipclear').length)
-	$('#paste').enable();
-else
-	$('#paste').disable();
-
-$('#clipclear').button().click(function() {
-	$.get('/cgi-bin/browse/clipboard.jim?act=clear', function() {
-		reloadclipboard();
-	});
-});
-
-$('a.clipdel').click(function() {
-	$.get('/cgi-bin/browse/clipboard.jim?act=remove&path=' +
-	    $(this).attr('path'), function() {
-		reloadclipboard();
-	});
-});
-
-$('#paste').button()
-    .click(function() {
-	disableall();
 	$('#pwdialogue').dialog({
 		title: "Pasting from clipboard",
 		modal: true, autoOpen: true,
@@ -47,8 +19,47 @@ $('#paste').button()
 		    $('.ui-dialog-titlebar-close').hide();
 		}
 	});
+}
+
+function reloadclipboard()
+{
+	$('#clipboard')
+	    .empty()
+	    .html('<img src=/img/loading.gif> <i>Loading...</i>')
+	    .load('/browse/clipboard.jim', function() {
+
+// Start Clipboard post-load actions
+
+if ($('#clipclear').length)
+{
+	$('#paste').enable();
+	$('#doptmenu,#dooptmenu').enableContextMenuItems('#paste');
+}
+else
+{
+	$('#paste').disable();
+	$('#doptmenu,#dooptmenu').disableContextMenuItems('#paste');
+}
+
+$('#clipclear').button().click(function() {
+	$.get('/browse/clipboard.jim?act=clear', function() {
+		reloadclipboard();
+	});
+});
+
+$('a.clipdel').click(function() {
+	$.get('/browse/clipboard.jim?act=remove&path=' +
+	    $(this).attr('path'), function() {
+		reloadclipboard();
+	});
+});
+
+$('#paste').button()
+    .click(function() {
+	disableall();
+	pastedialogue();
 	$('#pwfeedback').load(
-	    '/cgi-bin/browse/clipboard.jim?act=paste&dir='
+	    '/browse/clipboard.jim?act=paste&dir='
 	    + encodeURIComponent(dir), function() {
 		$('#pwdialogue').dialog('close');
 		window.location.reload(true);
@@ -63,19 +74,17 @@ $('#paste').button()
 
 function epginfo_callback(data, status, xhr)
 {
-	var width = 85;
+	//console.log(status);
+	//console.dir(data);
 
 	if (status != 'success')
 		return;
 
-	//console.log(status);
-	//console.dir(data);
+	$('#rename_title').val(data.title);
+	$('#rename_synopsis').val(data.synopsis);
+	$('#rename_guidance').val(data.guidance);
+	$('#rename_genre').val(data.genre);
 
-	$('#titleorig').val(data.title);
-	$('#renametitle').val(data.title);
-	if (data.synopsis.length > width)
-		data.synopsis = data.synopsis.substring(0, width) + '...';
-	$('#synopsis').html(data.synopsis);
 	$('tr.tstype').show('slow');
 }
 
@@ -84,10 +93,14 @@ function insert_folder_size(folder, size)
 	folder = folder.replace(/ /g, '');
 	folder = folder.replace(/([ #;&,.+*~\':"!^$[\]()=>|\/@])/g, '\\$1');
 	//console.log("Folder: (%s) = (%s)", folder, size);
-	if (folder == "")
-		$('#dirsize').text(' (' + size + 'iB)');
+	if (size.search(/\d$/) == -1)
+		size += 'iB';
 	else
-		$('#' + folder).text(' (' + size + 'iB)');
+		size += ' bytes';
+	if (folder == "")
+		$('#dirsize').text(' (' + size + ')');
+	else
+		$('#' + folder).text(' (' + size + ')');
 }
 
 function folder_size_callback(data, status, xhr)
@@ -112,6 +125,24 @@ function new_folder_callback(data, status, xhr)
 	$.each(data, set_folder_new);
 }
 
+//function insert_shrunk(file, perc)
+//{
+//	if (perc == 0)
+//	{
+//		file = file.replace(/[ ]/g, '');
+//		file = file.replace(/([ #;&,.+*~\':"!^$[\]()=>|\/@])/g, '\\$1');
+//		//console.log("File: (%s) = (%s)", file, perc);
+//		$('#sp_' + file).show();
+//	}
+//}
+
+//function shrunk_callback(data, status, xhr)
+//{
+//	//console.log("Status: %s", status);
+//	//console.dir(data);
+//	$.each(data, insert_shrunk);
+//}
+
 function delete_callback(file, dir, id)
 {
 	var el = 'div.bf#' + id;
@@ -119,7 +150,7 @@ function delete_callback(file, dir, id)
 	$(results)
 	    .html('<img src=/img/loading.gif>Deleting, please wait...')
 	    .slideDown('slow')
-	    .load('/cgi-bin/browse/delete.jim', {
+	    .load('/browse/delete.jim', {
 		'dir': dir,
 		'files': [decodeURIComponent(file)]
 		}, function() {
@@ -131,40 +162,48 @@ function delete_callback(file, dir, id)
 
 function lock_callback(file, type, id)
 {
-	var url = '/cgi-bin/browse/lock.jim?file=' + file;
+	var url = '/browse/lock.jim?file=' + file;
 	$.get(url, function() { window.location.reload(true); });
 }
 
 function enc_callback(file, type, id)
 {
-	var url = '/cgi-bin/browse/enc.jim?file=' + file;
+	var url = '/browse/enc.jim?file=' + file;
 	$.get(url, function() { window.location.reload(true); });
 }
 
 function new_callback(file, type, id)
 {
-	var url = '/cgi-bin/browse/new.jim?file=' + file;
+	var url = '/browse/new.jim?file=' + file;
 	$.get(url, function() { window.location.reload(true); });
 }
 
 function rename_submit()
 {
 	var s = $('#renameform_form').serialize();
-	$.get('/cgi-bin/browse/rename.jim?' + s,
+	$.post('/browse/rename.jim', s,
 	    function() { window.location.reload(true); });
 }
 
 function drename_submit()
 {
 	var s = $('#drenameform_form').serialize();
-	$.get('/cgi-bin/browse/rename.jim?' + s,
+	$.get('/browse/rename.jim?' + s,
+	    function() { window.location.reload(true); });
+}
+
+function aexpiry_submit()
+{
+	$('#aexpiry_working').slideDown('slow');
+	var s = $('#aexpiry_form').serialize();
+	$.get('/browse/aexpiry.jim?' + s,
 	    function() { window.location.reload(true); });
 }
 
 function newdir_submit()
 {
 	var s = $('#newdirform_form').serialize();
-	$.get('/cgi-bin/browse/mknewdir.jim?' + s,
+	$.get('/browse/mknewdir.jim?' + s,
 	    function() { window.location.reload(true); });
 }
 
@@ -173,7 +212,7 @@ function savestream_submit()
 	var s = $('#savestream_form').serialize();
 	var sf = $('#save_stream').attr('file');
 	$('#savestream_spin').show();
-	$.get('/cgi-bin/browse/savestream.jim?sfile=' +
+	$.get('/browse/savestream.jim?sfile=' +
 	    encodeURIComponent(sf) + '&' + s,
 	    function() {
 		window.location.reload(true);
@@ -202,22 +241,24 @@ function preparemenu(el, menu)
 {
 	if (el.attr('type') == 'ts')
 	{
-		if (el.attr('def') == 'HD')
-		{
-			$(menu).enableContextMenuItems('#enc');
-			if (el.attr('encd') == 1)
-				$(menu).changeContextMenuItem('#enc',
-				    'Remove Enc');
-			else
-				$(menu).changeContextMenuItem('#enc',
-				    'Set Enc');
-		}
+//		if (el.attr('def') == 'HD')
+//		{
+//			$(menu).enableContextMenuItems('#enc');
+//			if (el.attr('encd') == 1)
+//				$(menu).changeContextMenuItem('#enc',
+//				    'Remove Enc');
+//			else
+//				$(menu).changeContextMenuItem('#enc',
+//				    'Set Enc');
+//		}
 
 		if (el.attr('bx') > 0)
 			$(menu).enableContextMenuItems('#crop');
 		else
 			$(menu).disableContextMenuItems('#crop');
 
+		$(menu).enableContextMenuItems('#strip');
+
 		if (el.attr('rsize') > 4294967296)
 			$(menu).enableContextMenuItems('#chunk');
 		else
@@ -242,7 +283,8 @@ function preparemenu(el, menu)
 			$(menu).enableContextMenuItems('#delete');
 		}
 
-		if (el.attr('odencd') == 1 && el.attr('dlna') == 1)
+		if (el.attr('odencd') == 1 && el.attr('dlna') == 1 &&
+		    el.attr('encd') == 0)
 			$(menu).enableContextMenuItems('#decrypt');
 		else
 			$(menu).disableContextMenuItems('#decrypt');
@@ -255,24 +297,52 @@ function preparemenu(el, menu)
 		else
 		{
 			$(menu).enableContextMenuItems('#audio');
-			$(menu).enableContextMenuItems('#mpg');
+			if (el.attr('def') == 'HD')
+				$(menu).disableContextMenuItems('#mpg');
+			else
+				$(menu).enableContextMenuItems('#mpg');
 		}
 	}
 	else
 	{
 		$(menu).enableContextMenuItems('#delete');
 		$(menu).disableContextMenuItems('#lock');
-		$(menu).disableContextMenuItems('#enc');
+		//$(menu).disableContextMenuItems('#enc');
 		$(menu).disableContextMenuItems('#new');
-		$(menu).disableContextMenuItems('#decrypt');
-		$(menu).disableContextMenuItems('#audio');
-		$(menu).disableContextMenuItems('#mpg');
-		$(menu).disableContextMenuItems('#crop');
-		$(menu).disableContextMenuItems('#chunk');
 	}
 
 }
 
+function fixdmenu(el, menu, flag, tag, descr, recurse)
+{
+	var a = el.attr(flag);
+	var b = el.attr(flag + 'r');
+
+	if (a == undefined) a = 0;
+	if (b == undefined) b = 0;
+
+	if (a > 0)
+		$(menu).changeContextMenuItem(tag, 'Disable ' + descr);
+	else
+		$(menu).changeContextMenuItem(tag, 'Enable ' + descr);
+
+	if (recurse)
+	{
+		if (b > 0)
+		{
+			$(menu).changeContextMenuItem(tag + 'r',
+			    'Disable Recursive ' + descr);
+			$(menu).disableContextMenuItems(tag);
+		}
+		else
+		{
+			$(menu).changeContextMenuItem(tag + 'r',
+			    'Enable Recursive ' + descr);
+			$(menu).enableContextMenuItems(tag);
+		}
+	}
+}
+
 function preparedmenu(el, menu)
 {
 	if (el.attr('noflat') != undefined)
@@ -283,6 +353,12 @@ function preparedmenu(el, menu)
 			$(menu).changeContextMenuItem('#flat',
 			    'Prevent Flatten');
 	}
+
+	fixdmenu(el, menu, 'autoshrink', '#shrink', 'Auto-shrink', 1);
+	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, 'autoexpire', '#expire', 'Auto-expire', 0);
 }
 
 $(document).ready(function() {
@@ -308,7 +384,7 @@ var menuclick = function(action, el, pos)
 			break;
 		// Fallthrough
 	    case 'cut':
-		$.get('/cgi-bin/browse/clipboard.jim?act=add&mode=' + action +
+		$.get('/browse/clipboard.jim?act=add&mode=' + action +
 		    '&path=' + file, function() {
 			reloadclipboard();
 		    });
@@ -319,10 +395,10 @@ var menuclick = function(action, el, pos)
 		    file, type, id);
 		break;
 
-	    case 'enc':
-		confirm_action('change the ENC flag on', enc_callback,
-		    file, type, id);
-		break;
+//	    case 'enc':
+//		confirm_action('change the ENC flag on', enc_callback,
+//		    file, type, id);
+//		break;
 
 	    case 'new':
 		confirm_action('change the New flag on', new_callback,
@@ -331,16 +407,16 @@ var menuclick = function(action, el, pos)
 
 	    case 'rename':
 		$('#rename').val(decodeURIComponent(bfile));
-		$('#renameorig').val(decodeURIComponent(file));
+		$('#renamefile').val(decodeURIComponent(file));
 
-		$('#titleorig').val('');
-		$('#renametitle').val('');
-		$('#synopsis').val('');
+		$('#rename_title').val('');
+		$('#rename_synopsis').val('');
+		$('#rename_guidance').val('');
 		$('tr.tstype').css('display', 'none');
 
 		if (type == 'ts')
 		{
-			$.getJSON('/cgi-bin/browse/epgtitle.jim?file=' +
+			$.getJSON('/browse/epgtitle.jim?file=' +
 			    file, epginfo_callback);
 		}
 
@@ -348,32 +424,38 @@ var menuclick = function(action, el, pos)
 		break;
 
 	    case 'download':
-		window.location.href = '/cgi-bin/browse/download.jim?file=' +
-		    file;
+		window.location.href = '/browse/download.jim?file=' +
+		    file + '&base=' +
+		    encodeURIComponent(document.URL.match(/:\/\/(.[^/]+)/)[1]);
 		break;
 
 	    case 'crop':
-		window.location.href = '/cgi-bin/browse/crop/crop.jim?file=' +
+		window.location.href = '/browse/crop/crop.jim?file=' +
+		    file;
+		break;
+
+	    case 'strip':
+		window.location.href = '/browse/strip/strip.jim?file=' +
 		    file;
 		break;
 
 	    case 'chunk':
-		window.location.href = '/cgi-bin/browse/chunk/chunk.jim?file=' +
+		window.location.href = '/browse/chunk/chunk.jim?file=' +
 		    file;
 		break;
 
 	    case 'decrypt':
 		window.location.href =
-		    '/cgi-bin/browse/decrypt/decrypt.jim?file=' + file;
+		    '/browse/decrypt/decrypt.jim?file=' + file;
 		break;
 
 	    case 'audio':
-		window.location.href = '/cgi-bin/browse/audio/audio.jim?file=' +
+		window.location.href = '/browse/audio/audio.jim?file=' +
 		    file;
 		break;
 
 	    case 'mpg':
-		window.location.href = '/cgi-bin/browse/mpg/mpg.jim?file=' +
+		window.location.href = '/browse/mpg/mpg.jim?file=' +
 		    file;
 		break;
 
@@ -383,16 +465,44 @@ var menuclick = function(action, el, pos)
 	}
 };
 
+function flagdir(file, flag, iconset, output, options)
+{
+	var url = '/browse/flagdir.jim?dir=' + file +
+		    '&flag=' + flag;
+
+	$(output).load(url, function() {
+		$(iconset)
+		    .empty()
+		    .html('<img src=/img/loading.gif> Updating...')
+		    .load('/browse/iconset.jim?file=' + file);
+		if ($(options).attr(flag) == '1')
+			$(options).attr(flag, 0);
+		else
+			$(options).attr(flag, 1);
+	}).delay(3000).slideUp();
+}
+
 var dmenuclick = function(action, el, pos)
 {
 	var direl = $(el).parent().parent();
 	var file = $(el).parent().prevAll('a.dbf').last().attr('file');
+	var iconset = $(el).parent().prevAll('span.iconset').last();
 	var bfile = file.replace(/.*\//g, '');
 	bfile = bfile.replace(/[\x00-\x1f]+/g, '');
 	var results = $(el).parent().next('div.results');
 
 	switch (action)
 	{
+	    case 'paste':
+		pastedialogue();
+		$('#pwfeedback').load(
+		    '/browse/clipboard.jim?act=paste&dir=' +
+		    file, function() {
+			$('#pwdialogue').dialog('close');
+			reloadclipboard();
+		});
+		break;
+
 	    case 'delete':
 
 		if (confirm('Are you sure you wish to delete "' +
@@ -403,7 +513,7 @@ var dmenuclick = function(action, el, pos)
 			    .html('<img src=/img/loading.gif>' +
 			    'Deleting, please wait...')
 			    .slideDown('slow')
-			    .load('/cgi-bin/browse/delete.jim', {
+			    .load('/browse/delete.jim', {
 				'dir': dir,
 				'files': [decodeURIComponent(file)]
 				}, function() {
@@ -419,7 +529,7 @@ var dmenuclick = function(action, el, pos)
 			break;
 		// Fallthrough
 	    case 'cut':
-		$.get('/cgi-bin/browse/clipboard.jim?act=add&mode=' + action +
+		$.get('/browse/clipboard.jim?act=add&mode=' + action +
 		    '&path=' + file, function() {
 			reloadclipboard();
 		    });
@@ -431,8 +541,52 @@ var dmenuclick = function(action, el, pos)
 		$('#drenameform').dialog('open');
 		break;
 
+	    case 'expire':
+		if ($(el).attr('autoexpire') == 1)
+			flagdir(file, 'autoexpire', iconset, results, el);
+		else
+		{
+			$('#aexpiry_ldir').val(decodeURIComponent(file));
+			if ($(el).attr('autoexpiredays') > 0)
+				$('#aexpiry_days')
+				     .val($(el).attr('autoexpiredays'));
+			else
+				$('#aexpiry_days').val(7);
+			$('#aexpiry_working').hide('fast');
+			$('#aexpiry').dialog('open');
+		}
+		break;
+
 	    case 'flat':
-		var url = '/cgi-bin/browse/flat.jim?file=' + file;
+		flagdir(file, 'noflatten', iconset, results, el);
+		break;
+
+	    case 'dedup':
+		flagdir(file, 'autodedup', iconset, results, el);
+		break;
+
+	    case 'mpg':
+		flagdir(file, 'autompg', iconset, results, el);
+		break;
+
+	    case 'shrink':
+		flagdir(file, 'autoshrink', iconset, results, el);
+		break;
+
+	    case 'shrinkr':
+		flagdir(file, 'autoshrinkr', iconset, results, el);
+		break;
+
+	    case 'decrypt':
+		flagdir(file, 'autodecrypt', iconset, results, el);
+		break;
+
+	    case 'decryptr':
+		flagdir(file, 'autodecryptr', iconset, results, el);
+		break;
+
+	    case 'resetnew':
+		var url = '/browse/resetnew.jim?dir=' + file;
 		$.get(url, function() { window.location.reload(true); });
 		break;
 
@@ -452,6 +606,16 @@ var dmenuclick = function(action, el, pos)
 		menuclick
 	);
 
+	// Bind context menu to opt+ image
+	$('img.oopt').contextMenu(
+		{
+			menu: 'ooptmenu',
+			leftButton: true,
+			beforeShow: preparemenu
+		},
+		menuclick
+	);
+
 	$('img.dopt').contextMenu(
 		{
 			menu: 'doptmenu',
@@ -461,6 +625,15 @@ var dmenuclick = function(action, el, pos)
 		dmenuclick
 	);
 
+	$('img.doopt').contextMenu(
+		{
+			menu: 'dooptmenu',
+			leftButton: true,
+			beforeShow: preparedmenu
+		},
+		dmenuclick
+	);
+
 	// Disable items which are not yet implemented.
 	$('#optmenu').disableContextMenuItems('#title');
 
@@ -490,7 +663,7 @@ var dmenuclick = function(action, el, pos)
 
 		disableall();
 
-		window.location = '/cgi-bin/browse/play.jim?' +
+		window.location = '/play/play.jim?' +
 		    'dir=' + encodeURIComponent(dir) +
 		    '&file=' + file;
 	}
@@ -503,7 +676,7 @@ var dmenuclick = function(action, el, pos)
 		var type = $(this).attr('type');
 		var opt = $(this).nextAll('a').find('img.opt');
 
-		var url = '/cgi-bin/browse/file.jim?file=' + file
+		var url = '/browse/file.jim?file=' + file
 		    + '&type=' + type;
 		$dialog.load(url);
 
@@ -544,6 +717,19 @@ var dmenuclick = function(action, el, pos)
 		close: function() { $('#drename').val(''); }
 	});
 
+	$('#aexpiry').dialog({
+		autoOpen: false,
+		height: 'auto', width: 'auto',
+		modal: true,
+		buttons: {
+			"Update": aexpiry_submit,
+			"Close": function() {
+				$(this).dialog('close');
+			}
+		},
+		close: function() { $('#aexpiry_days').val('0'); }
+	});
+
 	$('#savestreamform').dialog({
 		autoOpen: false,
 		height: 'auto', width: 'auto',
@@ -566,11 +752,15 @@ var dmenuclick = function(action, el, pos)
 	});
 
 	// Load folder sizes
-	$.getJSON('/cgi-bin/browse/sizes.jim?dir=' + encodeURIComponent(dir),
+	$.getJSON('/browse/sizes.jim?dir=' + encodeURIComponent(dir),
 		folder_size_callback);
 
+	// Flag shrunk recordings
+//	$.getJSON('/browse/shrunk.jim?dir=' + encodeURIComponent(dir),
+//		shrunk_callback);
+
 	// Flag folders with unwatched items
-	$.getJSON('/cgi-bin/browse/newdir.jim?dir=' + encodeURIComponent(dir),
+	$.getJSON('/browse/newdir.jim?dir=' + encodeURIComponent(dir),
 		new_folder_callback);
 
 	// Load clipboard
@@ -582,7 +772,7 @@ var dmenuclick = function(action, el, pos)
 	// Buttons
 
 	$('#dedup').button().click(function() {
-		window.location = '/cgi-bin/dedup.jim?dir='
+		window.location = '/dedup/dedup.jim?dir='
 		    + encodeURIComponent(dir);
 	});
 
@@ -590,7 +780,7 @@ var dmenuclick = function(action, el, pos)
 		$('#savestream_spin').hide();
 		$('#savestreamform').dialog('open');
 		$('#savestream_detail').load(
-		    '/cgi-bin/browse/ffmpeg.jim?file=' +
+		    '/browse/ffmpeg.jim?file=' +
 		    encodeURIComponent($('#save_stream').attr('file')));
 	});
 
@@ -610,7 +800,7 @@ var dmenuclick = function(action, el, pos)
 			files.push($(this).attr('file'));
 		});
 		//console.log("%o", files);
-		window.location.href = '/cgi-bin/browse/join/join.jim?files=' +
+		window.location.href = '/browse/join/join.jim?files=' +
 		    files.join();
 	    });
 
@@ -642,7 +832,7 @@ var dmenuclick = function(action, el, pos)
 				}
 			});
 			$('#pwfeedback').load(
-			    '/cgi-bin/browse/delete.jim', {
+			    '/browse/delete.jim', {
 				'dir': dir,
 				'files': files
 				}, function() {
@@ -664,7 +854,7 @@ var dmenuclick = function(action, el, pos)
 		    'Copying recordings can take a very long time!'))
 			return;
 
-		$.post('/cgi-bin/browse/clipboard.jim', {
+		$.post('/browse/clipboard.jim', {
 		    'act': 'add',
 		    'dir': dir,
 		    'mode': action,
@@ -705,5 +895,30 @@ var dmenuclick = function(action, el, pos)
 
 	});
 
+	var streamsize = 0;
+
+	function checkstream()
+	{
+		$.get('/browse/streamsize.jim', function(size) {
+			//console.log('Stream size: %o', size);
+			var mb = size / (1024 * 1024);
+			mb = mb|0;
+			if (streamsize && size > streamsize)
+			{
+				rate = (size - streamsize) * 8.0 /
+				    (3 * 1048576);
+				$('#streamstatus').text(mb +
+				    ' MiB (growing @' + rate.toFixed(2) +
+				    ' Mib/s)');
+			}
+			else
+				$('#streamstatus').text(mb + ' MiB');
+			streamsize = size;
+		});
+	}
+
+	if ($('#streamstatus').length)
+		setInterval(checkstream, 3000);
+
 });
 

var/mongoose/html/browse/shrunk.jim

@@ -0,0 +1,34 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+require ts.class
+
+httpheader "application/json"
+
+set dir [cgi_get dir "-"]
+if {$dir eq "-"} exit
+
+puts "{"
+foreach file [readdir -nocomplain $dir] {
+	if {![string match {*.ts} $file]} { continue }
+
+	if {[catch {set ts [ts fetch "$dir/$file"]}]} continue
+
+	set eit 1
+	if {[$ts flag "Shrunk"]} { set eit 0 }
+
+	if {$eit} {
+		set xfile [file rootname $file]
+		if {[catch {set eit [\
+		    exec /mod/bin/stripts -cq "$dir/$xfile"]}]} {
+			continue
+		}
+		if {!$eit} { $ts set_shrunk }
+	}
+
+	puts " \"$file\": $eit,"
+}
+puts " \"dummy\": 0"
+puts "}"
+

var/mongoose/html/browse/sizes.jim

@@ -1,30 +1,25 @@
 #!/mod/bin/jimsh
 
 package require cgi
+source /mod/webif/lib/setup
 
-#puts "Content-Type: text/plain"
-puts "Content-Type: application/json"
-puts ""
+httpheader "application/json"
 
-cgi_input
-#cgi_dump
-
-#set _cgi(dir) "/media/My Video"
-
-set dir [dict get $_cgi dir]
+set dir [cgi_get dir]
+set dlen [string length "$dir/"]
 
 #9.4G	/media/My Video/Archive
 #1.4G	/media/My Video/CSI_ Crime Scene Investigation
 puts "{"
-regsub -all {([\\["$])} $dir {\\\1} xdir
 foreach line [split [exec /mod/bin/busybox/du -h -d 1 "$dir/"] "\n"] {
 	lassign [split $line "\t"] size node
-	regsub -- "^$xdir/" $node "" node
+	set node [string range $node $dlen end]
 	puts "\"$node\" : \"$size\","
 }
 
 # Handle symbolic links.
-foreach file [glob -nocomplain "$dir/*"] {
+foreach file [readdir $dir] {
+	set file "$dir/$file"
 	if {[catch {set lk [file readlink $file]}]} continue
 
 	if {![string match "/*" $lk]} { set lk "$dir/$lk" }

var/mongoose/html/browse/streamsize.jim

@@ -0,0 +1,13 @@
+#!/mod/bin/jimsh
+
+set stream "/mnt/hd3/Streamer_down_file"
+
+source /mod/webif/lib/setup
+httpheader "text/plain"
+
+if {[file exists $stream]} {
+	puts -nonewline [file size $stream]
+} else {
+	puts -nonewline 0
+}
+

var/mongoose/html/browse/strip/analyse.jim

@@ -0,0 +1,13 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+require ts.class pretty_size
+
+httpheader
+
+set rfile [cgi_get file]
+set base [file rootname $rfile]
+
+puts [exec /mod/bin/stripts -aq $base]
+

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

@@ -0,0 +1,50 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+require ts.class pretty_size
+
+httpheader
+
+set rfile [cgi_get file]
+set ts [ts fetch $rfile]
+set dir [file dirname $rfile]
+
+set len [$ts duration 1]
+
+set stripstart [clock milliseconds]
+
+set base [file rootname $rfile]
+set origdir "$dir/_original"
+if {![file exists $origdir]} { file mkdir $origdir }
+
+set shname [file tail $base]
+puts "Processing $shname"
+
+if {[file exists "$origdir/$shname.ts"]} {
+	puts "This recording already exists within _original"
+	puts "Cannot continue."
+	exit
+}
+
+puts "Moving recording to $origdir"
+foreach f [glob -nocomplain "${base}.*"] {
+	set tail [file tail $f]
+	puts "  $tail"
+	file rename $f "$origdir/$tail"
+}
+
+puts [exec /mod/bin/stripts \
+    "$origdir/$shname" \
+    "$dir/$shname" \
+    ]
+
+set newname "$shname-[clock seconds]"
+puts "Renaming file group to $newname"
+ts renamegroup "$dir/$shname.ts" $newname
+exec /mod/bin/hmt "+setfilename=$newname" "$dir/$newname.hmt"
+exec /mod/bin/hmt "+shrunk" "$dir/$newname.hmt"
+
+set striptime [expr [expr [clock milliseconds] - $stripstart] / 1000.0]
+puts "Time taken: $striptime"
+

var/mongoose/html/browse/strip/progress.jim

@@ -0,0 +1,24 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+require ts.class
+
+httpheader
+
+set tsfile [file normalize [cgi_get file]]
+set ntsfile "[file rootname $tsfile].nts"
+
+set origfile "[file dirname $tsfile]/_original/[file tail $ntsfile]"
+
+if {![file exists $ntsfile]} {
+	puts "0"
+} else {
+	set sz [file size $origfile]
+	set nsz [file size $ntsfile]
+
+	set perc [expr $nsz * 100 / $sz]
+	if {$perc > 100} { set perc 100 }
+	puts $perc
+}
+

var/mongoose/html/browse/strip/strip.jim

@@ -0,0 +1,61 @@
+#!/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]
+
+set esttime $([$ts size] / 5700000)
+
+puts "
+<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
+<script type=text/javascript src=/js/jquery.progressbar.js></script>
+<script type=text/javascript src=strip.js></script>
+
+<fieldset class=cleft>
+<legend>Make recordings smaller by removing unecessary frames</legend>
+
+<p><i>This process will remove freeview EPG data from the recording.<br>
+These data are not required and can increase the size of the
+recording file by as much as 20%.<br>
+Your original recording files will be retained in a folder called _original.
+</i>
+
+<table class=keyval cellpadding=5>
+<tr><th>File:</th><td>$rfile</td></tr>
+<tr><th>Length:</th><td>[clock format $len -format %T]</td></tr>
+<tr><th>Size:</th><td>[pretty_size [$ts size]] ([$ts get definition])</td></tr>
+<tr><th>Time:</th>
+<td>Shrinking will take around [clock format $esttime -format "%T"]</td></tr>
+<tr><th>Estimated Saving:</th>
+<td class=va><span id=analysis class=va>
+	<img class=va src=/img/loading.gif> Analysing file, please wait...
+</span></td></tr>
+</table>
+
+<span class=hidden id=params
+    file=\"[cgi_quote_url $rfile]\"
+    dir=\"[cgi_quote_url $dir]\"
+></span>
+
+<div id=stripdiv class=hidden style=\"padding: 1em\">
+<button id=stripit>Shrink recording</button>
+</div>
+
+<div id=progressdiv class=hidden>
+Shrinking: <div id=progressbar></div>
+</div>
+
+<button id=back class=hidden>Back to media list</button>
+
+<div id=output class=pre style=\"margin-top: 10px\"></div>
+</fieldset>
+"
+

var/mongoose/html/browse/strip/strip.js

@@ -0,0 +1,48 @@
+var handle = 0;
+
+function update()
+{
+	var file = $('#params').attr('file');
+
+	$.get('progress.jim' + '?file=' + file,
+	    function(data) {
+		if (handle)
+			$('#progressbar').reportprogress(data);
+	});
+}
+
+$(document).ready(function() {
+
+$('#analysis').load('analyse.jim?file=' + $('#params').attr('file'),
+	function(t) {
+		if ($.trim(t) == '0%')
+		{
+			$('#output').text('Recording is already stripped.');
+			$('#back').slideDown();
+		}
+		else
+			$('#stripdiv').slideDown();
+	});
+
+$('#progressbar').reportprogress(0);
+
+$('#back').button().click(function() {
+	window.location = '../index.jim?dir=' + $('#params').attr('dir');
+});
+
+$('#stripit').button().click(function() {
+	$('#stripdiv').hide('slow');
+	$('#progressdiv').show('slow');
+	handle = setInterval("update()", 1000);
+	$('#output').text('Please do not interrupt...')
+	    .load('execute.jim?file=' + $('#params').attr('file'),
+	    function() {
+		clearInterval(handle);
+		handle = 0;
+		$('#back').show();
+		$('#progressbar').reportprogress(100);
+	});
+});
+
+});
+

var/mongoose/html/css/jquery.alerts.css

@@ -0,0 +1,57 @@
+#popup_container {
+	font-family: Arial, sans-serif;
+	font-size: 12px;
+	min-width: 300px; /* Dialog will be no smaller than this */
+	max-width: 600px; /* Dialog will wrap after this width */
+	background: #FFF;
+	border: solid 5px #999;
+	color: #000;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	border-radius: 5px;
+}
+
+#popup_title {
+	font-size: 14px;
+	font-weight: bold;
+	text-align: center;
+	line-height: 1.75em;
+	color: #666;
+	background: #CCC url(/img/jalert/title.gif) top repeat-x;
+	border: solid 1px #FFF;
+	border-bottom: solid 1px #999;
+	cursor: default;
+	padding: 0em;
+	margin: 0em;
+}
+
+#popup_content {
+	background: 16px 16px no-repeat url(/img/jalert/info.gif);
+	padding: 1em 1.75em;
+	margin: 0em;
+}
+
+#popup_content.alert {
+	background-image: url(/img/jalert/info.gif);
+}
+
+#popup_content.confirm {
+	background-image: url(/img/jalert/important.gif);
+}
+
+#popup_content.prompt {
+	background-image: url(/img/jalert/help.gif);
+}
+
+#popup_message {
+	padding-left: 48px;
+}
+
+#popup_panel {
+	text-align: center;
+	margin: 1em 0em 0em 1em;
+}
+
+#popup_prompt {
+	margin: .5em 0em;
+}

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

@@ -64,5 +64,12 @@
 .contextMenu LI.delete A { background-image: url(/img/context/delete.png); }
 .contextMenu LI.cut A { background-image: url(/img/context/cut.png); }
 .contextMenu LI.quit A { background-image: url(/img/context/door.png); }
+.contextMenu LI.compress A { background-image: url(/img/context/compress.png); }
+.contextMenu LI.compressr A { background-image: url(/img/context/compressr.png); }
+.contextMenu LI.dedup A { background-image: url(/img/context/dedup.png); }
+.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.clock A { background-image: url(/img/context/clock.png); }
 
 

var/mongoose/html/css/style.css

@@ -235,6 +235,11 @@ pre, .pre
 	color: black;
 }
 
+.strike
+{
+	text-decoration: line-through;
+}
+
 .greenshade
 {
 	background: #e4faa8;
@@ -247,6 +252,12 @@ pre, .pre
 	color: black;
 }
 
+.redshade
+{
+	background: #ff4000;
+	color: white;
+}
+
 img.progress
 {
 	background: transparent url(/img/percentback.png) top left no-repeat;
@@ -326,3 +337,76 @@ div.cut
 	background: transparent;
 }
 
+div.toolbarouter
+{
+	position: relative;
+}
+
+div.toolbar
+{
+	position: absolute;
+	top: -20px;
+	left: 30px;
+	z-index: 29;
+	display: none;
+	width: 80%;
+	border: 1px solid #899caa;
+	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;
+	margin-top: -1px;
+	background: #d2e0ea;
+	padding: 6px;
+}
+
+span.toolbarcell
+{
+	float: left;
+	border-right: 1px solid #ccc;
+	text-align: center;
+	padding: 0 1em;
+}
+
+.tbhover
+{
+	background: #dfe8ef;
+	border-top: solid 1px #ccc;
+	border-left: solid 1px #ccc;
+}
+
+#tbstatus
+{
+	width: 100%;
+	border-top: 1px solid #ccc;
+	margin: 1em 0;
+	padding-top: 1em;
+}
+
+button.blue
+{
+	background: url(/img/gloss_wave_blue.png) repeat-x center;
+	border: 1px solid blue;
+	color: #ffffff;
+}
+
+button.green
+{
+	background: url(/img/gloss_wave_green.png) repeat-x center;
+	border: 1px solid green;
+	color: #ffffff;
+}
+
+button.red
+{
+	background: url(/img/gloss_wave_red.png) repeat-x center;
+	border: 1px solid green;
+	color: #ffffff;
+}
+
+div#restart_block
+{
+	z-index: 31;
+}
+

var/mongoose/html/css/vlc.css

@@ -1,60 +0,0 @@
-.x-vlc-slider  {
-    background:#C7F2FF;
-    text-align:center;
- 
- }
- .x-vlc-slider-thumb {
-    background:#4EAECC;
-    width:3px;
-}
-.x-vlc-main {
- 
-}
-.x-vlc-toolbar {
-
-    color:black;
-
-}
- .x-vlc-toolbar * {
-      vertical-align:top;
-
-      }
-.x-vlc-btn {
-   
-    padding-right:10px;
-  
-  
-}
-.x-vlc-btn-fullscreen {
-    background:url(/img/vlc/fullscreen2.gif) no-repeat;
-}
- .x-vlc-btn-plus {
-    background:url(/img/vlc/plus2.gif) no-repeat;
-}
-.x-vlc-btn-moins {
-    background:url(/img/vlc/moins2.gif) no-repeat;
-}
-.x-vlc-btn:hover {
-    color:red;
-    
-}
-.x-vlc-btn-play {
-    background:url(/img/vlc/play2.gif) no-repeat;
-}
-.x-vlc-btn-stop {
-    background:url(/img/vlc/stop2.gif) no-repeat;
-
-}
-.x-vlc-btn-pause {
-    background:url(/img/vlc/pause2.gif) no-repeat;
-
-}
-.x-vlc-timer {
-    width:100px;
-    font-size:12px;
-    vertical-align:top;
-    text-align:center
-}
-.x-vlc-about {
-    font-size:10px;
-}

var/mongoose/html/dedup/dedup

@@ -0,0 +1,91 @@
+#!/mod/bin/jimsh
+
+source /mod/webif/lib/setup
+require ts.class
+
+source /mod/webif/html/dedup/normalise.jim
+source /mod/webif/html/dedup/process.jim
+
+set dirs {}
+
+set auto 0
+set doit 0
+foreach arg $argv {
+	if {$arg eq "-yes"} {
+		set doit 1
+	} elseif {$arg eq "-auto"} {
+		set auto 1
+	} else {
+		lappend dirs $arg
+	}
+}
+if {![llength $dirs]} { lappend dirs [exec pwd] }
+
+foreach dir $dirs {
+	if {[string index $dir end] eq "/"} {
+		set dir [string range $dir 0 end-1]
+	}
+	if {!$auto} { puts "\[$dir\]" }
+	loadseries $dir
+
+	foreach file [readdir $dir] {
+		if {[file extension $file] ne ".hmt"} { continue }
+
+		set file "$dir/$file"
+
+		set base [file tail [file rootname $file]]
+		lassign [dedupprocess $file] stat ts syn fn
+
+		set rdone 0
+		set result $stat
+		switch $stat {
+		    inuse {
+			set result "In Use"
+		    }
+		    dup {
+			set result "Duplicate"
+			if {$doit} {
+				set dupdir "$dir/_duplicates"
+				if {![file exists $dupdir]} {
+					file mkdir $dupdir
+				}
+				while {[file exists $dupdir/$fn.hmt]} {
+					append fn "~"
+				}
+				ts renamegroup $file "_duplicates/$fn"
+				puts -nonewline "$base -> $result"
+				puts " - Renamed to _duplicates/$fn"
+				incr rdone
+			}
+		    }
+		    error {
+			set result "Cannot process"
+		    }
+		    nothing {
+			set result "Nothing to do"
+		    }
+		    preserve {
+			set result "Preserving"
+		    }
+		    ok {
+			set result $fn
+			if {$doit} {
+				# Dooooo, it.
+				$ts settitle $syn
+				ts renamegroup $file $fn
+				$ts set_deduped
+			}
+		    }
+		}
+		if {!$rdone} {
+			if {$auto} {
+				if {$result ne "Nothing to do"} {
+					puts "$base -> $result"
+				}
+			} else {
+				puts "$base -> $result"
+			}
+		}
+	}
+}
+

var/mongoose/html/dedup/dedup.jim

@@ -1,19 +1,18 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/var/mongoose/lib/setup
+source /mod/webif/lib/setup
 require ts.class pretty_size altrow
 
-puts "Content-Type: text/html"
-puts ""
+header
 
-cgi_input
-#cgi_dump
+source normalise.jim
+source process.jim
 
 set dir [cgi_get dir "/media/My Video"]
 set doit [cgi_get doit 0]
 
-header
+puts "<script type=text/javascript src=script.js></script>"
 
 puts "<fieldset style=\"display: inline\">
 <legend>De-duplicate <span id=dir>$dir</span></legend>
@@ -26,38 +25,24 @@ puts "<fieldset style=\"display: inline\">
 </tr>
 "
 
-set seen {}
-
+loadseries $dir
 foreach file [readdir $dir] {
 	set file "$dir/$file"
 	if {[file extension $file] ne ".hmt"} { continue }
-	altrow
-	set ts [ts fetch $file 1]
+
 	set base [file tail [file rootname $file]]
+	lassign [dedupprocess $file] stat ts syn fn
+
+	altrow
 	puts "<td nowrap>$base</td>"
-	set syn [$ts get synopsis]
-	regsub -nocase -all -- {^new series\.* *} $syn "" syn
-	regsub -nocase -all -- {^cbeebies\. *} $syn "" syn
-	regsub -all -- { *[:].*$} $syn "" syn
-	if {[string length $syn] > 40} {
-		lassign [split $syn "."] v w
-		set syn $v
-		if {[string length $syn] < 6 && [string length $w] < 6} {
-			append syn "_$w"
-		}
-	}
-	if {[string length $syn] < 10} {
-		if {[string match "${syn}*" [$ts get title]]} {
-			set syn [$ts get title]
-		} else {
-			append syn " [$ts get title]"
-		}
-	}
-	regsub -all -- {[\/ &]} $syn "_" fn
 	puts "<td>$fn</td>"
 	puts "<td>$syn</td>"
 	puts "<td>"
-	if {$fn in $seen} {
+	switch $stat {
+	    inuse {
+		puts -nonewline "In Use"
+	    }
+	    dup {
 		puts -nonewline "Duplicate"
 		if {$doit} {
 			set dupdir "$dir/_duplicates"
@@ -68,19 +53,26 @@ foreach file [readdir $dir] {
 			ts renamegroup $file "_duplicates/$fn"
 			puts -nonewline " - Renamed to _duplicates/$fn"
 		}
-	} elseif {[string length $syn] > 40} {
+	    }
+	    error {
 		puts -nonewline "Cannot process"
-	} elseif {$base eq $fn} {
+	    }
+	    nothing {
 		puts -nonewline "Nothing to do"
-	} elseif {[file exists "$dir/$fn.ts"]} {
+	    }
+	    preserve {
 		puts -nonewline "Preserving"
-	} elseif {$doit} {
-		# Dooooo, it.
-		$ts settitle $syn
-		ts renamegroup $file $fn
-		puts -nonewline "Done"
+	    }
+	    ok {
+		if {$doit} {
+			# Dooooo, it.
+			$ts settitle $syn
+			ts renamegroup $file $fn
+			$ts set_deduped
+			puts -nonewline "Done"
+		}
+	    }
 	}
-	lappend seen $fn
 	
 	puts "</td>"
 	puts "</tr>"
@@ -98,25 +90,8 @@ if {!$doit} { puts "<button id=dedup>Process folder</button>" }
 
 puts {
 </small>
-
 </div>
-
-<script type=text/javascript>
-$('#browse').button().click(function() {
-	window.location = '/cgi-bin/browse.jim?dir=' +
-	    encodeURIComponent($('#dir').text());
-});
 }
 
-if {!$doit} {
-	puts {
-	$('#dedup').button().click(function() {
-		window.location = window.location + '&doit=1';
-	});
-	}
-}
-
-puts "</script>"
-
 footer
 

var/mongoose/html/dedup/normalise.jim

@@ -0,0 +1,84 @@
+#!/mod/bin/jimsh
+
+set dedup_prefixes {
+	{^new series\.* *}
+	{^cbeebies\.* *}
+	{^cbbc\.* *}
+	{^t4: *}
+	{^brand new series *-* *}
+	{^\.+}
+}
+
+proc loadseries {dir} {
+	global seriesmap
+	set seriesmap [dict create]
+
+	if {![file exists "$dir/series.info"]} { return }
+
+	if {[catch {set fd [open "$dir/series.info" "r"]} msg]} {
+		puts "Error opening series.info: $msg"
+		return
+	}
+
+	foreach line [split [read $fd] "\n\r"] {
+		set i [string first " ==> " $line]
+		if {$i == -1} { continue }
+		set name [string range $line 0 $($i - 1)]
+		set prefix [string range $line $($i + 5) end]
+		if {$prefix eq ""} { continue }
+		dict set seriesmap $name $prefix
+		regsub -all -- {[[:space:]]+} [string tolower $name] "" name
+		dict set seriesmap $name $prefix
+	}
+	$fd close
+}
+
+proc dedupnormalise {title {reserve ""}} {
+	global dedup_prefixes seriesmap
+
+	# Strip common prefixes
+	foreach prefix $dedup_prefixes {
+		regsub -nocase -all -- $prefix $title "" title
+	}
+
+	# Strip anything following a colon.
+	regsub -all -- { *[:].*$} $title "" title
+
+	# If the resulting string is longer than 40 characters then
+	# split around . and take the left hand side if appropriate.
+	if {[string length $title] > 40} {
+		lassign [split $title "."] v w
+		set title $v
+		if {[string length $title] < 6 && [string length $w] < 6} {
+			append title "_$w"
+		}
+	}
+
+	if {[dict exists $seriesmap $title]} {
+		set ntitle "$seriesmap($title): $title"
+		set title $ntitle
+	} else {
+		# Try lower case without spaces
+		regsub -all -- {[[:space:]]+} [string tolower $title] "" ntitle
+		if {[dict exists $seriesmap $ntitle]} {
+			set title "$seriesmap($ntitle): $title"
+		}
+	}
+
+	# if still short, add the reserve string.
+	if {[string length $title] < 6} {
+		if {[string match "${title}*" $reserve]} {
+			set title $reserve
+		} else {
+			append title " $reserve"
+		}
+	}
+
+	# Shorten if too long.
+	if {[string length $title] > 40} {
+		set title [string range $title 0 39]
+	}
+
+	return $title
+}
+