1.0.5

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

CONTROL/control

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

CONTROL/postinst

@@ -1,29 +1,44 @@
 #!/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 >> /tmp/webif_auto.log 2>&1'
-) > $cronf
+crontab=$PKG_ROOT/bin/crontab
+if [ -x $crontab ]; then
+	$crontab -l | grep -v webif/lib/bin/auto > $tmpf
+	cat $tmpf - << EOM | $crontab -
+*/10 * * * * /mod/webif/lib/bin/auto >/dev/null 2>&1
+EOM
+fi
 
 # Add anacron jobs
 
 ana=$PKG_ROOT/etc/anacrontab
-grep -v 'backup/backup.jim' $ana > $tmpf
-(
-	cat $tmpf
-	echo "1 8 sched_backup /mod/var/mongoose/cgi-bin/backup/backup.jim"
-) > $ana
+egrep -v 'backup/backup.jim|bin/diskattrs' $ana > $tmpf
+cat $tmpf - << EOM > $ana
+1 8 sched_backup /mod/webif/cgi-bin/backup/backup.jim
+1 5 diskattrs /mod/webif/lib/bin/diskattrs
+EOM
 
 $PKG_ROOT/etc/init.d/S02anacron start < /dev/null > /dev/null 2>&1 &
 
+[ -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
+
+/mod/webif/lib/bin/diskattrs
+
+[ -f $tmpf ] && rm -f $tmpf
+
 exit 0
 

CONTROL/prerm

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

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

@@ -7,11 +7,7 @@ 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 \

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

@@ -5,20 +5,14 @@ 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

@@ -7,20 +7,14 @@ 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]} {

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

@@ -7,20 +7,14 @@ require rsv.class findhsvc
 
 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]} {

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

@@ -1,102 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/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]
-
-#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 first "$dir/" $file] != 0} {
-		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 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/webif/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/rename.jim

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

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

@@ -1,49 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-package require pack
-source /mod/webif/lib/setup
-require ts.class hexdump
-
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
-
-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/cgi-bin/browse/shrunk.jim

@@ -1,27 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-
-#puts "Content-Type: text/plain"
-puts "Content-Type: application/json"
-puts ""
-
-cgi_input
-#cgi_dump
-
-set dir [cgi_get dir "/media/My Video/Children"]
-
-puts "{"
-foreach file [readdir -nocomplain $dir] {
-	if {![string match {*.ts} $file]} { continue }
-
-	set xfile [file rootname $file]
-	if {[catch {set eit [exec /mod/bin/stripts -cq "$dir/$xfile"]}]} {
-		continue
-	}
-
-	puts " \"$file\": $eit,"
-}
-puts " \"dummy\": 0"
-puts "}"
-

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

@@ -5,13 +5,8 @@ package require sqlite3
 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,7 +66,8 @@ foreach tw [$db query {
 		switch $name {
 			"BBC ONE" { set mux "PSB1/BBC A" }
 			"ITV1" { set mux "PSB2/D3&4" }
-			"BBC One HD" { set mux "PSB3/BBC B (HD)" }
+			"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" }
 			"Film4" { set mux "COM6/ARQ B" }

var/mongoose/cgi-bin/db.jim

@@ -5,17 +5,12 @@ package require sqlite3
 source /mod/webif/lib/setup
 require altrow
 
-puts "Content-Type: text/html"
-puts ""
-
 set databases [glob /var/lib/humaxtv/*.db]
+lappend databases {*}[glob /mod/etc/*.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 +19,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

@@ -1,6 +1,7 @@
 #!/mod/bin/jimsh
 
-puts "Content-type: text/plain\n"
+source /mod/webif/lib/setup
+httpheader "text/plain"
 
 foreach f [dict keys $env] {
 	puts "$f = $env($f)"

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

@@ -4,21 +4,11 @@ package require cgi
 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

@@ -4,15 +4,11 @@ package require cgi
 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

@@ -4,22 +4,17 @@ package require cgi
 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

@@ -2,10 +2,7 @@
 
 package require cgi
 source /mod/webif/lib/setup
-require epg.class spinner.class altrow
-
-puts "Content-Type: text/html"
-puts ""
+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,14 +38,13 @@ 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 ""} {
@@ -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

@@ -4,9 +4,6 @@ package require cgi
 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]

var/mongoose/cgi-bin/opkg.jim

@@ -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

@@ -4,10 +4,7 @@ package require cgi
 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/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

@@ -2,17 +2,13 @@
 
 package require cgi
 source /mod/webif/lib/setup
-require settings.class
-require plugin
+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"} {
+	set val [cgi_get val off]
+	if {$val in {0 off}} {
 		file delete /mod/etc/mongoose.cert
 		puts "HTTPS Server will be disabled after next reboot."
 	} else {
@@ -22,6 +18,18 @@ if {[cgi_get act] eq "https"} {
 	exit
 }
 
+if {[cgi_get act] eq "xtelnet"} {
+	set val [cgi_get val off]
+	if {$val in {0 off}} {
+		file delete /mod/boot/xtelnet
+		puts "Telnet server expert mode will be disabled after next reboot."
+	} else {
+		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]
@@ -31,6 +39,11 @@ set epg_style [$settings epg_style]
 set pkgdev [$settings pkgdev]
 set notoolbar [$settings notoolbar]
 set nomobile [$settings nomobile]
+set nohelplinks [$settings nohelplinks]
+set xepghours [$settings xepghours]
+if {$xepghours == 0} { set xepghours 4 }
+set genrededup [$settings genrededup]
+set autolog [$settings autolog]
 
 # Handle updates
 
@@ -65,10 +78,14 @@ 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 nohelplinks $nohelplinks "Disable help links"
+handle_int_update genrededup $genrededup "Genre search dedup"
+handle_int_update autolog $autolog "Auto-processing log level"
 
 set acluser [cgi_get acluser "-"]
 set aclpass [cgi_get aclpass "-"]
@@ -109,6 +126,22 @@ puts {
 <link href=/css/iphone-style-checkboxes.css rel=stylesheet type=text/css />
 }
 
+proc setting_toggle {name attr checked {invert 0} {val 0}} {
+	puts -nonewline "
+	    <tr>
+		<th class=key>$name</th>
+		<td><input class=setting_toggle type=checkbox value=yes"
+	if {$checked} { puts -nonewline " checked" }
+	puts -nonewline " attr=$attr"
+	if {$invert} { puts -nonewline " invert=1" }
+	if {$val} { puts -nonewline " useval=1" }
+	puts -nonewline ">
+		<div id=${attr}_output></div>
+		</td>
+	</tr>
+	"
+}
+
 puts "
 	<fieldset style=\"display: inline\">
 		<legend>
@@ -133,37 +166,47 @@ puts "
 	</tr>
 "
 
-puts -nonewline "
-	<tr>
-		<th class=key>HTTPS web server?</th>
-		<td><input id=https_toggle name=https type=checkbox value=yes"
-if {[file exists /mod/etc/mongoose.cert]} { puts -nonewline " checked" }
-puts ">
-		    <div id=https_output></div>
-		</td>
-	</tr>
-"
+setting_toggle "HTTPS web server?" "https" \
+    [file exists /mod/etc/mongoose.cert] 0 1
+setting_toggle "Slide-down toolbar?" "notoolbar" $(!$notoolbar) 1
+setting_toggle "Mobile link on main page?" "nomobile" $(!$nomobile) 1
+setting_toggle "Help links on main page?" "nohelplinks" $(!$nohelplinks) 1
 
 puts -nonewline "
 	<tr>
-		<th class=key>Slide-down toolbar?</th>
-		<td><input id=toolbar_toggle name=toolbar type=checkbox value=yes"
-if {$notoolbar == 0} { puts -nonewline " checked" }
-puts ">
-		    <div id=toolbar_output></div>
+	<form class=auto id=autolog method=get action=$env(REQUEST_URI)>
+		<th class=key>Auto-processing log level</th>
+		<td><select id=autolog name=autolog
+		    class=\"text ui-widget-content ui-corner-all\">
+"
+puts "<option value=0"
+if {$autolog == 0} { puts " selected" }
+puts ">Actions and errors only\n"
+puts "<option value=1"
+if {$autolog == 1} { puts " selected" }
+puts ">Actions, errors and scan information\n"
+puts "<option value=2"
+if {$autolog == 1} { puts " selected" }
+puts ">Debugging information\n"
+puts "
+		</select>
+		<small>
+		<input name=autolog value=\"set\" type=submit>
+		</small>
+		<div id=autolog_output></div>
 		</td>
+	</form>
 	</tr>
 "
 
-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 "
@@ -221,37 +264,69 @@ puts "
 "
 
 puts "
-	</table>
-	</fieldset>
-	<br><br>
-	<fieldset style=\"display: inline\">
-	<legend> Email Settings </legend>
-	<table>
+	<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 "
-	<tr>
-	<form class=auto id=smtp_server method=get action=$env(REQUEST_URI)>
-		<th class=key>SMTP Server for outbound email</th>
-		<td><input name=smtp_server value=\"$smtp_server\"
-		    class=\"text ui-widget-content ui-corner-all\"
-		    length=20 maxlength=50>
-		    <small>
-		    <input id=smtp_server_submit value=\"change\" type=submit>
-		    </small>
-		    <div id=smtp_server_output></div>
+		</select>
+		<small>
+		<input name=xepghours value=\"set\" type=submit>
+		</small>
+		<div id=xepghours_output></div>
 		</td>
 	</form>
 	</tr>
 "
 
+setting_toggle "De-duplicate genre search results?" genrededup $genrededup
+
 puts "
 	</table>
 	</fieldset>
+	<br><br>
 "
 
+#puts "
+#	<fieldset style=\"display: inline\">
+#	<legend> Email Settings </legend>
+#	<table>
+#"
+#
+#puts "
+#	<tr>
+#	<form class=auto id=smtp_server method=get action=$env(REQUEST_URI)>
+#		<th class=key>SMTP Server for outbound email</th>
+#		<td><input name=smtp_server value=\"$smtp_server\"
+#		    class=\"text ui-widget-content ui-corner-all\"
+#		    length=20 maxlength=50>
+#		    <small>
+#		    <input id=smtp_server_submit value=\"change\" type=submit>
+#		    </small>
+#		    <div id=smtp_server_output></div>
+#		</td>
+#	</form>
+#	</tr>
+#"
+#
+#puts "
+#	</table>
+#	</fieldset>
+#	<br><br>
+#"
+
 puts "
-	<br><br>
 	<fieldset style=\"display: inline\">
 	<legend> Web Interface User Access Control </legend>
 	<table>
@@ -346,16 +421,16 @@ puts -nonewline "
 	<fieldset style=\"display: inline\">
 	<legend> Advanced Settings </legend>
 	<table>
-	<tr>
-		<th class=key>Show development and advanced packages?</th>
-		<td><input name=pkgdev id=pkgdev value=1 type=checkbox
 "
-if {$pkgdev} { puts -nonewline " checked" }
-puts ">
-		</td>
-	</tr>
+setting_toggle "Show development and advanced packages?" "pkgdev" $pkgdev
+
+if {[system modversion 1] >= 214} {
+	setting_toggle "Expert mode telnet server?" "xtelnet" \
+	    [file exists /mod/boot/xtelnet] 0 1
+}
+
+puts "
 	</table>
-	<div id=pkgdev_output></div>
 	</fieldset>
 "
 

var/mongoose/cgi-bin/settings.js

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

var/mongoose/cgi-bin/status.jim

@@ -2,20 +2,21 @@
 
 package require cgi
 source /mod/webif/lib/setup
-require system.class findhsvc epg.class
+require system.class findhsvc epg.class rsv.class
 
 set runmode cli
 if {[string match {*jim} $argv0]} { set runmode cgi }
 
-cgi_input
-
-set type [cgi_get type "full"]
-
-if {$runmode eq "cgi"} {
-	puts "Content-Type: text/html"
-	puts "Pragma: no-cache"
-	puts "Expires: Thu, 01 Jan 1970 00:00:00 GMT"
-	puts ""
+set schedtime 1200 
+case $runmode {
+    cgi {
+	set type [cgi_get type "full"]
+	httpheader
+    }
+    cli {
+	set type "full"
+	if {"-X" in $argv} { set schedtime 7200 }
+    }
 }
 
 if {[catch {set pid [exec pgrep humaxtv]}]} {
@@ -62,7 +63,10 @@ if {[llength $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 {$ndata($name) == -1} {
+		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"
@@ -146,6 +150,29 @@ if {[system instandby]} {
 	}
 }
 
+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]} {
 	if {$runmode eq "cgi"} {
 		puts [join $output "\n<br>\n"]

var/mongoose/cgi-bin/xepg.jim

@@ -3,27 +3,27 @@
 package require cgi
 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
@@ -31,7 +31,8 @@ if {$stt <= [clock seconds]} {
 
 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)
@@ -64,21 +65,42 @@ if {$::qepg} {
 }
 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>"
@@ -101,7 +123,7 @@ foreach e $records {
 
 		puts "[$e channel_icon 30]&nbsp;"
 		puts "$chnum
-	    <a href=/cgi-bin/epg/service.jim?service=[$e get service_id]
+	    <a href=\"/cgi-bin/epg/service.jim?service=[$e get service_id]\"
 		title=\"[$e get channel_name]\">
 	    [$e get channel_name]
 	    </a></div>"
@@ -151,7 +173,10 @@ foreach e $records {
 	    clock format $ee -format "%H:%M"])"
 	if {$showing} { append hxt " ($perc%)" }
 
-	puts "<div class=\"xeprog $bg\"
+	set lbg $bg
+	if {[$e scheduled]} { set lbg "blueshade" }
+
+	puts "<div class=\"xeprog $lbg\"
 	    style=\"width: [expr $px - 4]px;\" title=\"$htxt\">
 	    <a class=event href=# xs=[$e get service_id]
 		xe=[$e get event_id] sch=[$e get sched_type]
@@ -173,6 +198,9 @@ puts "
 	Switch to standard now/next display.
 </button></small>
 </div>
+"
+
+puts "
 
 <script type=text/javascript>
 \$(document).ready(function() {
@@ -180,12 +208,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  = Math.round(val / 86400000.0);
+                // 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} {

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

@@ -21,10 +21,14 @@ if {$model eq "HDR"} {
 }
 if {[system pkginst ffmpeg]} {
 	puts {
-		<li><a href=#audio>Extract Audio</a></li>
-		<li><a href=#mpg>Extract to MPG</a></li>
+		<li class=mp3><a href=#audio>Extract Audio</a></li>
+		<li class=mpg><a href=#mpg>Extract to MPG</a></li>
+		<li class=thm><a href=#thm>Set Thumbnail</a></li>
 	}
 }
+
+puts { <li><a href=#vthm>View Thumbnail</a></li> }
+
 if $nicesplice {
 	puts {
 		<li class="cut"><a href=#crop>Crop</a></li>
@@ -45,7 +49,15 @@ puts {
 	<li><a href=#download>Download</a></li>
 </ul>
 
-<ul id=doptmenu class=contextMenu style="width: 180px">
+<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>
@@ -53,22 +65,37 @@ puts {
 	<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> }
+	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>
+}
+
+if {[system pkginst ffmpeg]} {
+	puts {
+		<li class=mp3><a href=#mp3>Auto-Audio Extract</a></li>
+		<li class=mpg><a href=#mpg>Auto-MPG Extract</a></li>
+	}
+}
+
 puts {
 </ul>
 
 <div id=renameform title="Rename media file" style="display: none">
 	<form id=renameform_form>
-	<input type=hidden name="renameorig" id="renameorig" value="">
-	<input type=hidden name="titleorig" id="titleorig" value="">
+	<input type=hidden name="renamefile" id="renamefile" value="">
 	<table border=0>
 	<tr>
 	<th>
@@ -82,28 +109,86 @@ puts {
 		    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">
+		<label for="rename_title" style="padding-top: 0.5em">
 			<b>New Medialist Title</b>
 		</label>
 	</th>
 	<td>
-		<input type=text name="renametitle" id="renametitle"
+		<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>
-	<td colspan=2 id=synopsis style="font-style: italic"></td>
+	<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="renameorig" id="drenameorig" value="">
+	<input type=hidden name="renamefile" id="drenameorig" value="">
 	<table border=0>
 	<tr>
 	<th>
@@ -169,6 +254,32 @@ puts {
 	</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 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">
@@ -180,5 +291,9 @@ Please wait...
 </center>
 </div>
 
+<div id=bmpdialogue title="Recording Thumbnail" class=hidden>
+<img id=thmbmp class=doublebmp src="about:blank">
+</div>
+
 }
 

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

@@ -5,18 +5,13 @@ package require cgi
 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

@@ -5,10 +5,7 @@ package require cgi
 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

@@ -4,10 +4,7 @@ package require cgi
 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/bmp.jim

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

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

@@ -4,10 +4,7 @@ package require cgi
 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

@@ -4,10 +4,7 @@ package require cgi
 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

@@ -4,10 +4,7 @@ package require cgi
 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

@@ -4,13 +4,9 @@ package require cgi
 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]
 
@@ -110,9 +106,11 @@ switch $action {
 			}
 		} else {
 			if {$mode eq "cut"} {
-				catch {file rename $path "$dir/[file tail $f]"}
+				catch {file rename $path \
+				    "$dir/[file tail $path]"}
 			} else {
-				catch {file copy $path "$dir/[file tail $f]"}
+				catch {file copy $path \
+				    "$dir/[file tail $path]"}
 			}
 		}
 	}

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

@@ -4,10 +4,7 @@ package require cgi
 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

@@ -4,10 +4,7 @@ package require cgi
 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]
 
@@ -52,6 +49,8 @@ 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"
+# New nicesplice shrinks whilst cropping.
+exec /mod/bin/hmt "+shrunk" "$dir/$newname.hmt"
 
 set croptime [expr [expr [clock milliseconds] - $cropstart] / 1000.0]
 puts "Time taken: $croptime"

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

@@ -4,10 +4,7 @@ package require cgi
 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

@@ -5,18 +5,13 @@ package require cgi
 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]
 set dir [file dirname $rfile]
 set len [$ts duration 1]
-lassign [$ts dlnaloc] url
-
-header
+lassign [$ts dlnaloc "127.0.0.1"] url
 
 puts "
 <link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />

var/mongoose/html/browse/decrypt/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

@@ -5,16 +5,13 @@ package require cgi
 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]
 set dir [file dirname $rfile]
 set len [$ts duration 1]
-lassign [$ts dlnaloc] url
+lassign [$ts dlnaloc "127.0.0.1"] url
 
 if {$url eq ""} {
 	puts "This file has not been indexed by the media server.

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

@@ -4,10 +4,7 @@ package require cgi
 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

@@ -5,11 +5,6 @@ package require sqlite3
 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 ""]
 

var/mongoose/html/browse/enc.jim

@@ -1,17 +1,12 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/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

@@ -1,15 +1,12 @@
 #!/mod/bin/jimsh
 
 package require cgi
+source /mod/webif/lib/setup
 
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
+httpheader
 
 if [file exists /mod/bin/ffmpeg] {
-	set file [dict get $_cgi file]
+	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

@@ -4,18 +4,12 @@ package require cgi
 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)]
@@ -29,7 +23,12 @@ if {$type eq "ts"} {
 <table class=keyval>
 <tr>
 	<th>Title</th>
-	<td>[$ts get title]</td>
+	<td class=va>
+	"
+	if {[file exists "[file rootname $file].thm"]} {
+		puts "<img class=\"bmp va\" width=70 height=39 src=\"bmp.jim?file=$file\">"
+	}
+	puts "[$ts get title]</td>
 </tr><tr>
 	<th>Synopsis</th>
 	<td>[$ts get synopsis]</td>
@@ -152,7 +151,7 @@ puts "
 </table>
 "
 
-set url "/cgi-bin/browse/ffmpeg.jim?file=[cgi_quote_url $file]"
+set url "/browse/ffmpeg.jim?file=[cgi_quote_url $file]"
 puts { <script type="text/javascript"> }
 puts "var url = \"$url\";"
 puts {

var/mongoose/html/browse/flagdir.jim

@@ -3,11 +3,7 @@
 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 flag [cgi_get 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

@@ -4,8 +4,7 @@ package require cgi
 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/"
 }
 
@@ -55,11 +52,19 @@ proc directory {file bfile tbfile} {
 
 	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 "
+		<img class=\"$class va\" border=0 width=45 "
 	puts -nonewline [join $attrs " "]
 	puts "
 		    src=/images/181_1_00_Help5_OPT_Plus.png>
@@ -72,17 +77,23 @@ proc directory {file bfile tbfile} {
 	puts "</div>"
 }
 
+set dircount 0
+set filecount 0
+
 proc entry {file} {{i 0}} {
+	global dircount filecount
+	
 	set bfile [file tail $file]
 	regsub -all " +" $bfile "" tbfile
 	if {[string index $bfile 0] == "\025"} {
 		set bfile [string range $bfile 1 end]
 	}
 	if [file isdirectory "$file"] {
+		incr dircount
 		directory $file $bfile $tbfile
 		return
 	}
-	set ext [file extension $file]
+	set ext [string tolower [file extension $file]]
 	if {$ext in $::ignore || $ext ni $::include} { return }
 
 	file stat $file st
@@ -91,11 +102,13 @@ proc entry {file} {{i 0}} {
 
 	set base [file rootname $file]
 
+	set thmok 0
 	if {$ext eq ".ts" && [file exists "${base}.nts"]} {
 		set type ts
 		set ts [ts fetch $file 1]
 		set img Video_TS
 		set omenu opt
+		if {[file exists "${base}.thm"]} { set thmok 1 }
 	} elseif {$ext eq ".hmt"} {
 		if {[file exists "${base}.ts"]} { continue }
 		# Sole hmt file indicates failure to track.
@@ -109,6 +122,7 @@ proc entry {file} {{i 0}} {
 		set img Video_Other
 		set omenu oopt
 	}
+	incr filecount
 
 	set new 0
 	if {$type eq "ts"} {
@@ -147,7 +161,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
@@ -185,12 +214,11 @@ proc entry {file} {{i 0}} {
 			set dlna 1
 		}
 
-		# Shrunk (shown when necessary via Ajax)
-		icon "/img/compress.png" "Shrunk" \
-		    "id=\"sp_$tbfile\"" "va hidden"
-		# Timeshifted (shown when necessary via Ajax)
-		icon "/img/clock.png" "Time-shifted Recording" \
-		    "id=\"tsr_$tbfile\"" "va hidden"
+		# Shrunk
+		if {[$ts flag Shrunk]} {
+			icon "/img/compress.png" "Shrunk"
+			set shrunk 1
+		}
 
 		set bx [$ts get bookmarks]
 	}
@@ -201,8 +229,8 @@ proc entry {file} {{i 0}} {
 	      <a href=#>
 		<img class=\"$omenu va\" border=0 width=45 type=$type did=$i
 		    locked=$locked encd=$encd def=$def new=$new bx=$bx
-		    rsize=$rsz
-		    odencd=$odencd dlna=$dlna
+		    shrunk=$shrunk rsize=$rsz
+		    odencd=$odencd dlna=$dlna thmok=$thmok
 		    src=/images/181_1_00_Help5_OPT_Plus.png>
 	      </a>
 	    <div class=\"results blood\" style=\"margin: 0 0 0 5em\"></div>
@@ -210,27 +238,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 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;\">
 "
@@ -240,7 +268,7 @@ set stub ""
 foreach part [split $dir /] {
 	if {$stub eq "/"} { set name $part } else { set name "/$part" }
 	append stub $name
-	puts "<a href=$env(REQUEST_URI)?dir=[cgi_quote_url $stub]>$name</a>
+	puts "<a href=\"$env(REQUEST_URI)?dir=[cgi_quote_url $stub]\">$name</a>
 }
 puts "<span class=filesize id=dirsize></span>"
 puts "</legend>"
@@ -250,7 +278,7 @@ set parent [join [lrange [split $dir /] 0 end-1] /]
 if {$parent ne ""} {
 	puts "
 	    <div class=va>
-		<a href=$env(REQUEST_URI)?dir=[cgi_quote_url $parent]>
+		<a href=\"$env(REQUEST_URI)?dir=[cgi_quote_url $parent]\">
 		<img border=0 src=/images/711_3_09_Media_Folder_UP.png class=va>
 			\[parent directory\]</a>
 	    </div>
@@ -287,12 +315,16 @@ proc s_time {a b} {
 set files [readdir -nocomplain $dir]
 switch $order {
 	1 {		set files [lsort -command s_time $files] }
-	default {	set files [lsort $files] }
+	default {	set files [lsort -nocase $files] }
 }
 
 foreach file $files { entry "$dir/$file" }
 
-puts "<a href=# id=selectall>Select all</a> | <a href=# id=deselectall>none</a>"
+puts "
+<a href=# id=selectall>Select all</a> | <a href=# id=deselectall>none</a>
+&nbsp;&nbsp;
+Directories: $dircount, Files: $filecount
+"
 
 # Sort icons
 puts "<div id=sortdiv>"
@@ -305,7 +337,7 @@ foreach sl $sortlist {
 	set tag "Currently sorting"
 	if {$order != $index} {
 		puts "
-		    <a href=$env(REQUEST_URI)?$env(QUERY_STRING)&order=$index>"
+	    <a href=\"$env(REQUEST_URI)?$env(QUERY_STRING)&order=$index\">"
 		set tag "Sort"
 	}
 	puts "<img class=va border=0 src=/img/$img.gif> $tag by $descr"
@@ -359,6 +391,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

@@ -4,10 +4,9 @@ package require cgi
 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

@@ -4,7 +4,6 @@ package require cgi
 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/webif/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

@@ -4,15 +4,9 @@ package require cgi
 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

@@ -5,10 +5,7 @@ package require cgi
 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

@@ -5,18 +5,13 @@ package require cgi
 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

@@ -4,10 +4,7 @@ package require cgi
 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

@@ -4,15 +4,9 @@ package require cgi
 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
 
@@ -20,6 +15,7 @@ foreach dir [glob -nocomplain "$root"] {
 	if {[file exists "$dir/.series"]} {
 		set fd [open "$dir/.series"]
 		set bytes [read $fd 8]
+		$fd close
 		set recs [unpack $bytes -uintle 0 32]
 		set plays [unpack $bytes -uintle 32 32]
 		set diff $($recs - $plays)

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,12 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+require ts.class
+
+httpheader
+
+set dir [cgi_get dir]
+
+ts resetnew $dir
+

var/mongoose/html/browse/savestream.jim

@@ -4,11 +4,7 @@ package require cgi
 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

@@ -26,29 +26,29 @@ function reloadclipboard()
 	$('#clipboard')
 	    .empty()
 	    .html('<img src=/img/loading.gif> <i>Loading...</i>')
-	    .load('/cgi-bin/browse/clipboard.jim', function() {
+	    .load('/browse/clipboard.jim', function() {
 
 // Start Clipboard post-load actions
 
 if ($('#clipclear').length)
 {
 	$('#paste').enable();
-	$('#doptmenu').enableContextMenuItems('#paste');
+	$('#doptmenu,#dooptmenu').enableContextMenuItems('#paste');
 }
 else
 {
 	$('#paste').disable();
-	$('#doptmenu').disableContextMenuItems('#paste');
+	$('#doptmenu,#dooptmenu').disableContextMenuItems('#paste');
 }
 
 $('#clipclear').button().click(function() {
-	$.get('/cgi-bin/browse/clipboard.jim?act=clear', function() {
+	$.get('/browse/clipboard.jim?act=clear', function() {
 		reloadclipboard();
 	});
 });
 
 $('a.clipdel').click(function() {
-	$.get('/cgi-bin/browse/clipboard.jim?act=remove&path=' +
+	$.get('/browse/clipboard.jim?act=remove&path=' +
 	    $(this).attr('path'), function() {
 		reloadclipboard();
 	});
@@ -59,7 +59,7 @@ $('#paste').button()
 	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);
@@ -74,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');
 }
 
@@ -127,23 +125,23 @@ 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 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 shrunk_callback(data, status, xhr)
+//{
+//	//console.log("Status: %s", status);
+//	//console.dir(data);
+//	$.each(data, insert_shrunk);
+//}
 
 function delete_callback(file, dir, id)
 {
@@ -152,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() {
@@ -164,40 +162,62 @@ 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 thumbnail_callback(file, type, id)
+{
+	var el = 'div.bf#' + id;
+	var results = el + ' .results';
+	$(results)
+	    .html('<img src=/img/loading.gif>Generating thumbnail, ' +
+		'please wait...')
+	    .slideDown('slow')
+	    .load('/browse/thumbnail.jim?file=' + file)
+	    .delay(3000)
+	    .slideUp('slow');
+	$('div.bf#' + id + ' img.opt').attr('thmok', 1);
+}
+
 function rename_submit()
 {
 	var s = $('#renameform_form').serialize();
-	$.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); });
 }
 
@@ -206,7 +226,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);
@@ -251,12 +271,17 @@ function preparemenu(el, menu)
 		else
 			$(menu).disableContextMenuItems('#crop');
 
-/*
-		if (el.attr('def') == 'HD')
-			$(menu).disableContextMenuItems('#strip');
+		if (el.attr('odencd') == 0)
+			$(menu).enableContextMenuItems('#thm');
 		else
-*/
-			$(menu).enableContextMenuItems('#strip');
+			$(menu).disableContextMenuItems('#thm');
+
+		if (el.attr('thmok') == 1)
+			$(menu).enableContextMenuItems('#vthm');
+		else
+			$(menu).disableContextMenuItems('#vthm');
+
+		$(menu).enableContextMenuItems('#strip');
 
 		if (el.attr('rsize') > 4294967296)
 			$(menu).enableContextMenuItems('#chunk');
@@ -296,7 +321,10 @@ function preparemenu(el, menu)
 		else
 		{
 			$(menu).enableContextMenuItems('#audio');
-			$(menu).enableContextMenuItems('#mpg');
+			if (el.attr('def') == 'HD')
+				$(menu).disableContextMenuItems('#mpg');
+			else
+				$(menu).enableContextMenuItems('#mpg');
 		}
 	}
 	else
@@ -309,6 +337,36 @@ function preparemenu(el, menu)
 
 }
 
+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)
@@ -319,33 +377,13 @@ function preparedmenu(el, menu)
 			$(menu).changeContextMenuItem('#flat',
 			    'Prevent Flatten');
 	}
-	if (el.attr('autoshrink') != undefined)
-	{
-		if (el.attr('autoshrink') > 0)
-			$(menu).changeContextMenuItem('#shrink',
-			    'Disable Auto-shrink');
-		else
-			$(menu).changeContextMenuItem('#shrink',
-			    'Enable Auto-shrink');
-	}
-	if (el.attr('autodedup') != undefined)
-	{
-		if (el.attr('autodedup') > 0)
-			$(menu).changeContextMenuItem('#dedup',
-			    'Disable Auto-dedup');
-		else
-			$(menu).changeContextMenuItem('#dedup',
-			    'Enable Auto-dedup');
-	}
-	if (el.attr('autodecrypt') != undefined)
-	{
-		if (el.attr('autodecrypt') > 0)
-			$(menu).changeContextMenuItem('#decrypt',
-			    'Disable Auto-decrypt');
-		else
-			$(menu).changeContextMenuItem('#decrypt',
-			    'Enable Auto-decrypt');
-	}
+
+	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, 'automp3', '#mp3', 'Auto-audio', 0);
+	fixdmenu(el, menu, 'autoexpire', '#expire', 'Auto-expire', 0);
 }
 
 $(document).ready(function() {
@@ -371,7 +409,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();
 		    });
@@ -394,55 +432,68 @@ 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);
 		}
 
 		$('#renameform').dialog('open');
 		break;
 
+	    case 'thm':
+		window.location.href = '/browse/thumbnail/index.jim?file=' +
+		    file;
+		break;
+
+	    case 'vthm':
+//		window.open('/browse/bmpw.jim?file=' + file, 'hxwebifbmp',
+//		    'height=156,width=280,toolbar=no,' +
+//		    'scrollbars=no,menubar=no,location=no,titlebar=no');
+		$('#thmbmp').attr('src', 'bmp.jim?file=' + file);
+		$('#bmpdialogue').dialog('open');
+		break;
+
 	    case 'download':
-		window.location.href = '/cgi-bin/browse/download.jim?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 = '/cgi-bin/browse/strip/strip.jim?file=' +
+		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;
 
@@ -452,10 +503,28 @@ 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');
@@ -465,7 +534,7 @@ var dmenuclick = function(action, el, pos)
 	    case 'paste':
 		pastedialogue();
 		$('#pwfeedback').load(
-		    '/cgi-bin/browse/clipboard.jim?act=paste&dir=' +
+		    '/browse/clipboard.jim?act=paste&dir=' +
 		    file, function() {
 			$('#pwdialogue').dialog('close');
 			reloadclipboard();
@@ -482,7 +551,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() {
@@ -498,7 +567,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();
 		    });
@@ -510,32 +579,56 @@ 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/flagdir.jim?dir=' + file +
-		    '&flag=noflatten';
-		$.get(url, function() { window.location.reload(true); });
+		flagdir(file, 'noflatten', iconset, results, el);
 		break;
 
 	    case 'dedup':
-		var url = '/cgi-bin/browse/flagdir.jim?dir=' + file +
-		    '&flag=autodedup';
-		$.get(url, function() { window.location.reload(true); });
+		flagdir(file, 'autodedup', iconset, results, el);
+		break;
+
+	    case 'mpg':
+		flagdir(file, 'autompg', iconset, results, el);
+		break;
+
+	    case 'mp3':
+		flagdir(file, 'automp3', iconset, results, el);
 		break;
 
 	    case 'shrink':
-		var url = '/cgi-bin/browse/flagdir.jim?dir=' + file +
-		    '&flag=autoshrink';
-		$.get(url, function() { window.location.reload(true); });
+		flagdir(file, 'autoshrink', iconset, results, el);
+		break;
+
+	    case 'shrinkr':
+		flagdir(file, 'autoshrinkr', iconset, results, el);
 		break;
 
 	    case 'decrypt':
-		var url = '/cgi-bin/browse/flagdir.jim?dir=' + file +
-		    '&flag=autodecrypt';
-		$.get(url, function() { window.location.reload(true); });
+		flagdir(file, 'autodecrypt', iconset, results, el);
+		break;
+
+	    case 'decryptr':
+		flagdir(file, 'autodecryptr', iconset, results, el);
 		break;
 
 	    case 'resetnew':
-		var url = '/cgi-bin/browse/resetnew.jim?dir=' + file;
+		var url = '/browse/resetnew.jim?dir=' + file;
 		$.get(url, function() { window.location.reload(true); });
 		break;
 
@@ -574,6 +667,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');
 
@@ -616,7 +718,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);
 
@@ -657,6 +759,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',
@@ -670,6 +785,18 @@ var dmenuclick = function(action, el, pos)
 		close: function() { $('#savestream_name').val(''); }
 	});
 
+	$('#bmpdialogue').dialog({
+		autoOpen: false,
+		height: 'auto', width: 'auto',
+		modal: true,
+		buttons: {
+			"Close": function() {
+				$(this).dialog('close');
+			}
+		},
+		close: function() { $('#thmbmp').attr('src', 'about:blank'); }
+	});
+
 	// Create re-usable confirmation dialogue.
 	$confirm = $('#confirm').dialog({
 		modal: true, autoOpen: false,
@@ -679,15 +806,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('/cgi-bin/browse/shrunk.jim?dir=' + encodeURIComponent(dir),
-		shrunk_callback);
+//	$.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
@@ -707,7 +834,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')));
 	});
 
@@ -727,7 +854,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();
 	    });
 
@@ -759,7 +886,7 @@ var dmenuclick = function(action, el, pos)
 				}
 			});
 			$('#pwfeedback').load(
-			    '/cgi-bin/browse/delete.jim', {
+			    '/browse/delete.jim', {
 				'dir': dir,
 				'files': files
 				}, function() {
@@ -781,7 +908,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,
@@ -822,5 +949,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,17 +1,11 @@
 #!/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

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

@@ -4,10 +4,7 @@ package require cgi
 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 base [file rootname $rfile]

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

@@ -4,10 +4,7 @@ package require cgi
 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 ts [ts fetch $rfile]
@@ -46,6 +43,7 @@ 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

@@ -4,10 +4,7 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class
 
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
+httpheader
 
 set tsfile [file normalize [cgi_get file]]
 set ntsfile "[file rootname $tsfile].nts"

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

@@ -4,10 +4,7 @@ package require cgi
 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]
@@ -17,8 +14,6 @@ set len [$ts duration 1]
 
 set esttime $([$ts size] / 5700000)
 
-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/strip/strip.js

@@ -27,7 +27,7 @@ $('#analysis').load('analyse.jim?file=' + $('#params').attr('file'),
 $('#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');
 });
 
 $('#stripit').button().click(function() {

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -65,7 +65,13 @@
 .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.mp3 A { background-image: url(/img/context/mp3.png); }
+.contextMenu LI.clock A { background-image: url(/img/context/clock.png); }
+.contextMenu LI.thm A { background-image: url(/img/context/thumb.png); }
 
 

var/mongoose/html/css/style.css

@@ -65,13 +65,33 @@ div.footer
 	padding-top: 2em;
 }
 
-div.warningbox
+div.owarningbox
 {
 	background: url('/img/redshade.png') repeat-x;
 	padding: 0.5em;
 	margin: 1em;
 }
 
+div.warningbox
+{
+	width: 60%;
+	background: url('/img/redshade.png') repeat-x;
+	background-size: 100%;
+	#color: #005000;
+	border: 1px solid #7a4707;
+	padding: 10px;
+	position: relative;
+	top: -2px;
+	left: -2px;
+	font-weight: bold;
+	z-index: 30;
+	box-shadow: 2px 2px 11px #666;
+	-moz-box-shadow: 2px 2px 11px #666;
+	-webkit-box-shadow: 2px 2px 11px #666;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+}
+
 table
 {
 	empty-cells: show;
@@ -235,6 +255,11 @@ pre, .pre
 	color: black;
 }
 
+.strike
+{
+	text-decoration: line-through;
+}
+
 .greenshade
 {
 	background: #e4faa8;
@@ -400,3 +425,23 @@ button.red
 	color: #ffffff;
 }
 
+div#restart_block
+{
+	z-index: 31;
+}
+
+img.bmp, img.doublebmp
+{
+	transform: scaleY(-1);
+	-webkit-transform: scaleY(-1);
+	-o-transform: scaleY(-1);
+	height: 78px;
+	width: 140px;
+}
+
+img.doublebmp
+{
+	height: 156px;
+	width: 280px;
+}
+

var/mongoose/html/dedup/dedup

@@ -8,10 +8,13 @@ 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
 	}
@@ -22,7 +25,7 @@ foreach dir $dirs {
 	if {[string index $dir end] eq "/"} {
 		set dir [string range $dir 0 end-1]
 	}
-	puts "\[$dir\]"
+	if {!$auto} { puts "\[$dir\]" }
 	loadseries $dir
 
 	foreach file [readdir $dir] {
@@ -33,14 +36,14 @@ foreach dir $dirs {
 		set base [file tail [file rootname $file]]
 		lassign [dedupprocess $file] stat ts syn fn
 
-		puts -nonewline "$base -> "
-
+		set rdone 0
+		set result $stat
 		switch $stat {
 		    inuse {
-			puts -nonewline "In Use"
+			set result "In Use"
 		    }
 		    dup {
-			puts -nonewline "Duplicate"
+			set result "Duplicate"
 			if {$doit} {
 				set dupdir "$dir/_duplicates"
 				if {![file exists $dupdir]} {
@@ -50,29 +53,39 @@ foreach dir $dirs {
 					append fn "~"
 				}
 				ts renamegroup $file "_duplicates/$fn"
-				puts -nonewline " - Renamed to _duplicates/$fn"
+				puts -nonewline "$base -> $result"
+				puts " - Renamed to _duplicates/$fn"
+				incr rdone
 			}
 		    }
 		    error {
-			puts -nonewline "Cannot process"
+			set result "Cannot process"
 		    }
 		    nothing {
-			puts -nonewline "Nothing to do"
+			set result "Nothing to do"
 		    }
 		    preserve {
-			puts -nonewline "Preserving"
+			set result "Preserving"
 		    }
 		    ok {
-			puts -nonewline $fn
+			set result $fn
 			if {$doit} {
 				# Dooooo, it.
 				$ts settitle $syn
 				ts renamegroup $file $fn
-				puts -nonewline " ... Done"
+				$ts set_deduped
 			}
 		    }
 		}
-		puts ""
+		if {!$rdone} {
+			if {$auto} {
+				if {$result ne "Nothing to do"} {
+					puts "$base -> $result"
+				}
+			} else {
+				puts "$base -> $result"
+			}
+		}
 	}
 }
 

var/mongoose/html/dedup/dedup.jim

@@ -4,20 +4,14 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class pretty_size altrow
 
+header
+
 source normalise.jim
 source process.jim
 
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
-
 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\">
@@ -32,6 +26,7 @@ puts "<fieldset style=\"display: inline\">
 "
 
 loadseries $dir
+set recalc 0
 foreach file [readdir $dir] {
 	set file "$dir/$file"
 	if {[file extension $file] ne ".hmt"} { continue }
@@ -58,6 +53,7 @@ foreach file [readdir $dir] {
 			}
 			ts renamegroup $file "_duplicates/$fn"
 			puts -nonewline " - Renamed to _duplicates/$fn"
+			incr recalc
 		}
 	    }
 	    error {
@@ -74,6 +70,7 @@ foreach file [readdir $dir] {
 			# Dooooo, it.
 			$ts settitle $syn
 			ts renamegroup $file $fn
+			$ts set_deduped
 			puts -nonewline "Done"
 		}
 	    }
@@ -83,6 +80,8 @@ foreach file [readdir $dir] {
 	puts "</tr>"
 }
 
+if {$recalc} { ts resetnew $dir }
+
 puts {
 </table>
 </fieldset>

var/mongoose/html/dedup/normalise.jim

@@ -4,6 +4,7 @@ set dedup_prefixes {
 	{^new series\.* *}
 	{^cbeebies\.* *}
 	{^cbbc\.* *}
+	{^t4: *}
 	{^brand new series *-* *}
 	{^\.+}
 }
@@ -53,15 +54,6 @@ proc dedupnormalise {title {reserve ""}} {
 		}
 	}
 
-	# if still short, add the reserve string.
-	if {[string length $title] < 10} {
-		if {[string match "${title}*" $reserve]} {
-			set title $reserve
-		} else {
-			append title " $reserve"
-		}
-	}
-
 	if {[dict exists $seriesmap $title]} {
 		set ntitle "$seriesmap($title): $title"
 		set title $ntitle
@@ -73,6 +65,15 @@ proc dedupnormalise {title {reserve ""}} {
 		}
 	}
 
+	# 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]

var/mongoose/html/dedup/process.jim

@@ -4,6 +4,15 @@ require system.class
 
 proc dedupprocess {file} {{seen {}}} {
 	set ts [ts fetch $file 1]
+
+	if {[$ts flag "Deduped"]} {
+		# Fast track content which has already been de-duped.
+		set fn [file rootname [file tail $file]]
+		if {$fn in $seen} { set stat dup } else { set stat nothing }
+		lappend seen $fn
+		return [list $stat $ts "" $fn]
+	}
+
 	set dir [file dirname $file]
 	set base [file tail [file rootname $file]]
 	set syn [dedupnormalise [$ts get synopsis] [$ts get title]]
@@ -12,7 +21,7 @@ proc dedupprocess {file} {{seen {}}} {
 	regsub -all -- {[?]} $fn "" fn
 
 	set stat ok
-	if {[system inuse [file rootname $file]]} {
+	if {[$ts inuse]} {
 		set stat inuse
 	} elseif {$fn in $seen} {
 		set stat dup
@@ -20,6 +29,7 @@ proc dedupprocess {file} {{seen {}}} {
 		set stat error
 	} elseif {$base eq $fn} {
 		set stat nothing
+		$ts set_deduped
 	} elseif {[file exists "$dir/$fn.ts"]} {
 		set stat preserve
 	}

var/mongoose/html/dedup/script.js

@@ -2,7 +2,7 @@
 $(function() {
 
 $('#browse').button().click(function() {
-	window.location = '/cgi-bin/browse.jim?dir=' +
+	window.location = '/browse/index.jim?dir=' +
 	    encodeURIComponent($('#dir').text());
 });