tag 0.6.2

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

CONTROL/conffiles

@@ -1,6 +0,0 @@
-var/mongoose/html/css/EXTRA.css
-var/mongoose/html/favicon.ico
-var/mongoose/html/img/fav/57.png
-var/mongoose/html/img/fav/72.png
-var/mongoose/html/img/fav/114.png
-var/mongoose/html/img/fav/144.png

CONTROL/control

@@ -1,9 +1,11 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.0.8
+Version: 0.6.2
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
-Depends: webif-channelicons(>=1.1.8),mongoose(>=3.0-9),jim(>=0.74-4),jim-oo,jim-sqlite3(>=0.74-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,multienv(>=1.6)
-Suggests:
+Depends: mongoose(>=3.0),jim(>=0.71-1),jim-sqlite3(>=0.71-1),jim-cgi(>=0.4),jim-oo,jim-pack,service-control,busybox(>=1.18.3-1),lsof,epg(>=1.0.2),hmt(>=1.0.6),ssmtp
+Replaces: af123-webif
+Conflicts: af123-webif
+Suggests: ffmpeg
 Description: An evolving web interface for the Humax.

CONTROL/postinst

@@ -1,45 +0,0 @@
-#!/bin/sh
-
-echo "Postinstall $*"
-
-export tmpf=/tmp/cronf.$$
-
-# Add cron jobs
-
-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
-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
-/mod/webif/lib/bin/resetnew
-
-[ -f $tmpf ] && rm -f $tmpf
-
-exit 0
-

CONTROL/prerm

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-export tmpf=/tmp/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
-egrep -v 'backup/backup.jim|bin/diskattrs' $ana > $tmpf
-cp $tmpf $ana
-
-[ -f $tmpf ] && rm -f $tmpf
-
-exit 0
-

bin/status

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

etc/init.d/S60parseepg

@@ -1,24 +0,0 @@
-#!/bin/sh
-
-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 2>&1 &
-		;;
-	stop)
-		killall -q epg
-		;;
-	*)
-		exit 1
-		;;
-esac
-
-exit 0
-

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

@@ -1,37 +1,75 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
+source /mod/var/mongoose/lib/setup
 
 require rsv.class
 
-set dir "/mod/var/backup"
+set dir /mod/var/backup
 
-httpheader
+puts "Content-Type: text/html"
+puts ""
 
-set now [clock seconds]
-set file [file tail [cgi_get file \
-    [clock format $now -format "auto-%Y-%b-%d-%H:%M"]]]
+cgi_input
+#cgi_dump
 
-if {[string match {auto-*} $file]} {
-	# Delete any automatic backups over 7 days old.
-	set mt $(15 * 86400)
-	foreach af [glob -nocomplain "$dir/auto-*"] {
-		set aft [file mtime $af]
-		set diff $($now - $aft)
-		if {$diff > $mt} {
-			puts "Removing $af"
-			file delete $af 
-		}
-	}
+if {![dict exists $_cgi file]} {
+	puts "No filename supplied."
+	exit
 }
 
-set ffile "$dir/$file.rbk"
+set file [file tail [dict get $_cgi file]]
+set ffile "/$dir/$file.rbk"
 
 if {[file exists $ffile]} {
 	puts "Backup file <i>$file</i> already exists."
 	exit
 }
 
-rsv backup $ffile
+if {[catch { set fd [open $ffile w] } msg]} {
+	puts "Error creating backup file. - $msg"
+	exit
+}
+
+puts "Backing up scheduled recordings and events..."
+
+set events [rsv list]
+
+set fields [lsort [[rsv] vars]]
+
+#puts $fd "# [join $fields "\t"]"
+
+foreach event $events {
+	puts "  Backing up scheduled event '[$event name]'"
+	puts -nonewline $fd "event\t"
+
+	foreach f $fields {
+		if {$f eq "aulEventToRecordInfo"} { continue }
+		puts -nonewline $fd "[$event get $f]\t"
+	}
+	puts $fd ""
+}
+puts "Done."
+
+puts "Backing up channel favourites..."
+
+set grp 0
+foreach res [$rsvdb query {
+	select	eFavGroup,
+		TBL_FAV.eSvcType,
+		substr(szSvcName, 2) as szSvcName
+	from TBL_FAV join TBL_SVC using (hSvc)
+	order by eFavGroup
+    }] {
+	if {$res(eFavGroup) != $grp} {
+		set grp $res(eFavGroup)
+		puts "  Group $grp"
+	}
+	puts "    $res(szSvcName)"
+	puts $fd "fav\t$res(eFavGroup)\t$res(eSvcType)\t$res(szSvcName)"
+}
+puts "Done."
+
+close $fd
+rsv cleanup
 

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

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

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

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

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

@@ -1,9 +1,11 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
 
-httpheader
+puts "Content-Type: text/html"
+puts "Pragma: no-cache"
+puts "Expires: Thu, 01 Jan 1970 00:00:00 GMT"
+puts ""
 
 set dir "/mod/var/backup"
 
@@ -18,18 +20,7 @@ if {![file isdirectory $dir]} {
 	exit
 }
 
-proc s_time {a b} {
-	file stat $a l
-	set at $l(ctime)
-	file stat $b l
-	set bt $l(ctime)
-
-	if {$at < $bt} { return -1 }
-	if {$at > $bt} { return 1 }
-	return 0
-}
-
-set backups [lsort -command s_time [glob -nocomplain "$dir/*.rbk"]]
+set backups [glob -nocomplain "$dir/*.rbk"]
 
 if {![llength $backups]} {
 	empty

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

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

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

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

var/mongoose/cgi-bin/browse.jim

@@ -0,0 +1,236 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class pretty_size
+
+puts "Content-Type: text/html"
+puts ""
+
+set ignore {.nts .thm .hmt .hmi}
+set include {.ts .avi .mpg .mpeg .wmv .mkv .mp3 .mp4 .mov}
+
+cgi_input
+#cgi_dump
+
+#set env(REQUEST_URI) ''
+#set _cgi(dir) "/media/My Video/Chuggington"
+
+proc directory {file bfile} {
+	regsub -all " +" $bfile "" tbfile
+	puts "<div class=va>"
+	puts "<a href=$::env(REQUEST_URI)?dir=[cgi_quote_url $file]>"
+	puts "<img border=0 class=va id=\"img$tbfile\"
+	    src=/images/711_1_09_Media_Folder.png>"
+	puts "$bfile</a><span class=filesize id=\"$tbfile\">
+		</span></div>"
+}
+
+proc entry {file} {{i 0}} {
+	set bfile [file tail $file]
+	if {[string index $bfile 0] == "\025"} {
+		set bfile [string range $bfile 1 end]
+	}
+	if [file isdirectory "$file"] {
+		directory $file $bfile
+		continue
+	}
+	set ext [file extension $file]
+	if {$ext in $::ignore || $ext ni $::include} { continue }
+
+	file stat $file st
+	set sz [pretty_size $st(size)]
+
+	set base [file rootname $file]
+
+	if {$ext eq ".ts" && [file exists "${base}.nts"]} {
+		set type ts
+		set ts [ts fetch $file 1]
+		set img Video_TS
+	} else {
+		set type gen
+		set ts 0
+		set img Video_Other
+	}
+
+	puts "
+	    <div class=\"va bf\" id=[incr i]>
+	      <a class=bf file=\"$file\" type=$type href=#>
+	"
+
+	set new 0
+	if {$type eq "ts"} {
+		if {[$ts flag "New"] > 0} { set new 1 }
+	} else {
+		if {![file exists "[file rootname $file].hmi"]} { set new 1 }
+	}
+
+	if {$new} { append img _New }
+
+	puts "<img class=va border=0 src=/img/$img.png>"
+
+	puts "
+		$bfile
+	      </a>
+	"
+
+	# Size
+	puts "<span class=filesize> ($sz) </span>"
+
+	# Icons
+
+	set locked 0
+	set encd 0
+	set def unknown
+	if {$type eq "ts"} {
+		# HD / SD
+		if {[$ts get definition] eq "HD"} {
+			set def HD
+			set img "172_1_00_HD"
+		} else {
+			set def SD
+			set img "172_1_26_SD"
+		}
+		puts "<img class=va src=/images/$img.png height=21>"
+
+		# Locked
+		if {[$ts flag "Locked"] > 0} {
+			set locked 1
+			puts "<img class=va src=/images/178_1_00_Icon_Lock.png
+			    height=21>"
+		}
+
+		# Encrypted
+		if {[$ts flag "Encrypted"] > 0} {
+			set encd 1
+			puts "<img class=va
+			    src=/images/749_1_26_Video_Encryption.png
+			    height=21>"
+		}
+
+		# Guidance
+		if {[$ts flag "Guidance"] > 0} {
+			puts "<img class=va
+			    src=/images/174_1_26_GuidancePolicy.png
+			    height=21>"
+		}
+	}
+
+	# Opt+ button
+
+	puts "
+	      <a href=#>
+		<img class=\"opt va\" border=0 width=45 type=$type did=$i
+		    locked=$locked encd=$encd def=$def new=$new
+		    src=/images/181_1_00_Help5_OPT_Plus.png>
+	      </a>
+	    <div class=\"results blood\" style=\"margin: 0 0 0 5em\"></div>
+	"
+	puts "</div>"
+}
+
+if {[dict exists $_cgi dir]} {
+	set dir [dict get $_cgi dir]
+} else {
+	set dir "/media/My Video"
+}
+
+######################################################################
+# Render web page
+
+header
+
+puts { 
+	<link href=/css/jquery.contextMenu.css rel=stylesheet type=text/css />
+	<script type="text/javascript" src="/js/jquery.contextMenu.js"></script>
+
+	<ul id=optmenu class=contextMenu>
+		<li><a href=#delete>Delete</a></li>
+		<li><a href=#lock>Toggle Lock</a></li>
+		<li><a href=#enc>Toggle Enc</a></li>
+		<li><a href=#new>Toggle New</a></li>
+		<li><a href=#rename>Rename</a></li>
+		<li><a href=#download>Download</a></li>
+	</ul>
+
+	<div id=renameform title="Rename media file" style="display: none">
+		<form id=renameform_form>
+		<input type=hidden name="renameorig" id="renameorig" value="">
+		<input type=hidden name="titleorig" id="titleorig" value="">
+		<table border=0>
+		<tr>
+		<th>
+			<label for="rename">
+				<b>New Filename</b>
+			</label>
+		</th>
+		<td>
+			<input type=text name="rename" id="rename"
+			    value="" size=70 maxlength=255
+			    class="text ui-widget-content ui-corner-all">
+		</td>
+		</tr>
+		<tr style="display: none" class=tstype>
+		<th>
+			<label for="renametitle" style="padding-top: 0.5em">
+				<b>New EPG Title</b>
+			</label>
+		</th>
+		<td>
+			<input type=text name="renametitle" id="renametitle"
+			    value="" size=70 maxlength=48
+			    class="text ui-widget-content ui-corner-all">
+		</td>
+		</tr>
+		<tr style="display: none" class=tstype>
+		<td colspan=2 id=synopsis style="font-style: italic"></td>
+		</tr>
+		</table>
+		</form>
+	</div>
+
+	<div id=dialogue></div>
+	<div id=confirm title="Confirmation Required"></div>
+
+	<script type=text/javascript src=/cgi-bin/browse/browse.js></script>
+}
+
+puts "<span style=\"display:none\" id=dir>$dir</span>"
+
+# Breadcrumb path
+puts "
+      <fieldset style=\"margin: 1em\">
+      <legend style=\"font-size: 1.5em; padding: 0 0.5em 0.5em 0.5em;\">
+"
+set stub ""
+foreach part [split $dir /] {
+	if {$stub eq "/"} { set name $part } else { set name "/$part" }
+	append stub $name
+	puts "<a href=$env(REQUEST_URI)?dir=[cgi_quote_url $stub]>$name</a>
+}
+puts "<span class=filesize id=dirsize></span>"
+puts "</legend>"
+
+# Parent directory
+set parent [join [lrange [split $dir /] 0 end-1] /]
+if {$parent ne ""} {
+	puts "
+	    <div class=va>
+		<a href=$env(REQUEST_URI)?dir=[cgi_quote_url $parent]>
+		<img border=0 src=/images/711_3_09_Media_Folder_UP.png class=va>
+			\[parent directory\]</a>
+	    </div>
+	"
+}
+
+# Strip double slashes
+regsub -all -- {\/+} "$dir/*" "/" dir
+
+foreach file [lsort [glob -nocomplain "$dir"]] {
+	entry $file
+}
+
+puts "</fieldset>"
+
+footer
+

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,11 +2,16 @@
 
 package require cgi
 package require pack
-source /mod/webif/lib/setup
 
-httpheader "application/json"
+puts "Content-Type: application/json"
+puts ""
 
-set root [cgi_get dir]
+cgi_input
+#cgi_dump
+
+#set _cgi(dir) "/media/My Video"
+
+set root [dict get $_cgi dir]
 # Strip double slashes
 regsub -all -- {\/+} "$root/*" "/" root
 
@@ -15,11 +20,10 @@ 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)
-		if {$diff > 0} {
+		if {$diff != 0} {
 			set node [lindex [split $dir /] end]
 			puts "\"$node\": $diff,"
 		}

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

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

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

@@ -0,0 +1,26 @@
+#!/mod/bin/jimsh
+
+package require cgi
+
+puts "Content-Type: application/json"
+puts ""
+
+cgi_input
+#cgi_dump
+
+#set _cgi(dir) "/media/My Video"
+
+set dir [dict get $_cgi dir]
+
+#9.4G	/media/My Video/Archive
+#1.4G	/media/My Video/CSI_ Crime Scene Investigation
+puts "{"
+foreach line [split [exec /mod/bin/busybox/du -h "$dir/"] "\n"] {
+	set fields [split $line "\t"]
+	set size [lindex $fields 0]
+	set node [lindex [split [lindex $fields 1] /] end]
+	puts "\"$node\" : \"$size\","
+}
+puts "\"dummy\" : \"\""
+puts "}"
+

var/mongoose/cgi-bin/cat.jim

@@ -1,25 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-require system.class chunked pretty_size
-
-cgi_input
-#cgi_dump
-
-set file [cgi_get file "-"]
-if {$file eq "-"} { exit }
-
-start_chunked
-
-if {![file exists $file]} {
-	chunk ">>> File $file does not exist.\r\n"
-} else {
-	chunk ">>> Contents of $file [pretty_size [file size $file]]\r\n"
-	set fp [open $file r]
-	chunk [read $fp]
-	close $fp
-}
-
-end_chunked
-

var/mongoose/cgi-bin/cfwreset.cgi

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-[ -n "$QUERY_STRING" ] && rma="${QUERY_STRING##*=}" || rma=0
-
-echo "Content-Type: text/plain"
-echo
-
-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

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

var/mongoose/cgi-bin/db.jim

@@ -2,15 +2,17 @@
 
 package require cgi
 package require sqlite3
-source /mod/webif/lib/setup
+source /mod/var/mongoose/lib/setup
 require altrow
 
-set databases [glob /var/lib/humaxtv/*.db]
-lappend databases {*}[glob /mod/etc/*.db]
-lappend databases "/mnt/hd2/dms_cds.db"
+puts "Content-Type: text/html"
+puts ""
 
 header
 
+cgi_input
+#cgi_dump
+
 set ftab [cgi_get tab]
 set fdb [cgi_get db]
 
@@ -19,7 +21,7 @@ if {$fdb != 0} {
 }
 
 proc db_info {db_file} {
-	global fdb ftab
+	global _cgi fdb ftab
 
 	if {$fdb != 0 && [file tail $db_file] ne $fdb} { return }
 	if {![file exists $db_file]} { return }
@@ -60,16 +62,10 @@ proc db_info {db_file} {
 	$db close
 }
 
-if {$fdb == 0} {
-	puts "Please choose database to view:<ul>"
-	foreach db $databases {
-		puts "<li><a href=$::env(REQUEST_URI)?db=[file tail $db]>
-		    $db</a></li>"
-	}
-	puts "</ul>"
-} else {
-	foreach db $databases { db_info $db }
-}
+db_info /var/lib/humaxtv/rsv.db
+db_info /var/lib/humaxtv/setup.db
+db_info /var/lib/humaxtv/channel.db
+db_info /mnt/hd2/dms_cds.db
 
 footer
 

var/mongoose/cgi-bin/env.jim

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

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

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

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

@@ -1,151 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-require epg.class system.class settings.class
-
-set irinst [system pkginst ir]
-
-httpheader
-
-set service [cgi_get service 0]
-set event [cgi_get event 0]
-if {![cgi_exists bare]} header
-
-set record [lindex [epg fetch dump -service $service -event $event] 0]
-$record get_channel_info
-set others [$record othertimes]
-
-if {[[settings] chanchangenc]} {
-	puts { <script type=text/javascript src=/js/chanchangenc.js></script> }
-} else {
-	jqplugin confirmAction
-	puts { <script type=text/javascript src=/js/chanchange.js></script> }
-}
-
-puts "
-	<table class=keyval>
-	<tr>
-		<th>Programme</th>
-		<td>[$record get name]</td>
-	</tr><tr>
-		<th>Synopsis</th>
-		<td>[$record get text]</td>
-	</tr><tr>
-		<th>Start</th>
-		<td>[clock format [$record get start] -format {%c %Z}]
-"
-
-foreach o $others {
-	if {[$o ended]} { continue }
-	$o get_channel_info
-	$o process_sched
-	if {[$o get series_crid] eq ""} { set ro 1 } else { set ro 2 }
-	puts -nonewline "<br><font class=also>&nbsp;&nbsp;&nbsp;&nbsp;"
-	puts -nonewline "Also: "
-	puts -nonewline "<a class=event href=# xs=[$o get service_id] "
-	puts -nonewline "xe=[$o get event_id] "
-	puts -nonewline "sch=[$o get sched_type] rec=$ro>"
-	puts -nonewline "[clock format [$o get start] -format {%c %Z}]"
-	puts -nonewline " on "
-	puts -nonewline [$o channel_icon 16]
-	puts -nonewline "[$o get channel_name] "
-	puts "</a>"
-	puts "</font>"
-}
-
-puts "
-		</td>
-	</tr><tr>
-		<th>Duration</th>
-		<td>[clock format [$record get duration] -format %T]
-"
-if {[$record showing]} {
-	puts [progressbar [$record percent]]
-}
-puts "
-	</td>
-	</tr><tr>
-		<th>Type</th>
-		<td>[$record get content_type] ([$record get content_code])</td>
-	</tr>
-"
-
-if {[$record get warning] != ""} {
-	puts "
-	<tr>
-		<th>Warning</th>
-		<td>[$record get warning]</td>
-	</tr>
-	"
-}
-
-if {[$record get event_crid] != ""} {
-	puts "
-	<tr>
-		<th>CRID</th><td>
-		<a href=/cgi-bin/epg/search.jim?crid=[$record get event_crid]>
-			<img border=0 height=14
-			    src=/images/421_1_00_CH_Title_2R_Arrow.png>
-			[$record get channel_crid][$record get event_crid]
-			</a>
-		</td>
-	</tr>
-	"
-}
-
-if {[$record get series_crid] != ""} {
-	puts "
-	<tr>
-		<th nowrap>Series CRID</th><td>
-		<a href=/cgi-bin/epg/search.jim?scrid=[$record get series_crid]>
-			<img border=0 height=14
-			    src=/images/421_1_00_CH_Title_2R_Arrow.png>
-			[$record get channel_crid][$record get series_crid]
-			</a>
-		</td>
-	</tr>
-	"
-}
-
-if {[$record get rec_crid] != ""} {
-	set rec [$record recommended]
-	if {$rec != ""} {
-		puts "<tr><th>Recommends</th><td>
-			<a href=/cgi-bin/epg/search.jim?crid=[$rec get event_crid]>
-			<img border=0 height=14
-			    src=/images/421_1_00_CH_Title_2R_Arrow.png>
-			[$rec get name]
-			([$rec get channel_crid][$rec get event_crid])
-			</a>
-		</td></tr>"
-	}
-}
-
-puts "
-	<tr>
-		<td colspan=2 valign=top>
-"
-if {$irinst} {
-	puts "<a class=chanchange chan=[$record get channel_num] href=#>"
-}
-puts [$record channel_icon 70]
-if {$irinst} { puts "</a>" }
-
-puts "
-			[join [$record icon_set] "&nbsp;"]
-		</td>
-	</tr>
-	</table>
-
-	<a class=footnote href=/cgi-bin/epg/dump.jim?service=[$record get service_id]&event=[$record get event_id]&raw=1>
-		<img border=0 src=/images/532_1_00_Find_Path_Arrow.png>
-		Show raw EPG info
-	</a>
-"
-
-puts "<div id=epginfo_extra class=footnote></div>"
-
-epg cleanup
-if {![cgi_exists bare]} footer
-

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

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

var/mongoose/cgi-bin/epg_dump.jim

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

var/mongoose/cgi-bin/epg_info.jim

@@ -0,0 +1,116 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require epg.class
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+set service 0
+catch { set service [dict get $_cgi service] }
+set event 0
+catch { set event [dict get $_cgi event] }
+if {! [dict exists $_cgi bare]} { header }
+
+#set service 8384
+#set event 25293
+
+set record [lindex [epg fetch dump -service $service -event $event] 0]
+$record get_channel_info
+
+puts "
+	<table class=keyval>
+	<tr>
+		<th>Programme</th>
+		<td>[$record get name]</td>
+	</tr><tr>
+		<th>Synopsis</th>
+		<td>[$record get text]</td>
+	</tr><tr>
+		<th>Start</th>
+		<td>[clock format [$record get start] -format {%c %Z}]</td>
+	</tr><tr>
+		<th>Duration</th>
+		<td>[clock format [$record get duration] -format %T]
+"
+if {[$record showing]} {
+	puts [progressbar [$record percent]]
+}
+puts "
+	</td>
+	</tr><tr>
+		<th>Type</th>
+		<td>[$record get content_type] ([$record get content_code])</td>
+	</tr>
+"
+
+if {[$record get warning] != ""} {
+	puts "
+	<tr>
+		<th>Warning</th>
+		<td>[$record get warning]</td>
+	</tr>
+	"
+}
+
+if {[$record get event_crid] != ""} {
+	puts "
+	<tr>
+		<th>CRID</th>
+		<td>[$record get channel_crid][$record get event_crid]</td>
+	</tr>
+	"
+}
+
+if {[$record get series_crid] != ""} {
+	puts "
+	<tr>
+		<th nowrap>Series CRID</th><td>
+		<a href=/cgi-bin/epg_search.jim?scrid=[$record get series_crid]>
+			<img border=0 height=14
+			    src=/images/421_1_00_CH_Title_2R_Arrow.png>
+			[$record get channel_crid][$record get series_crid]
+			</a>
+		</td>
+	</tr>
+	"
+}
+
+if {[$record get rec_crid] != ""} {
+	set rec [$record recommended]
+	if {$rec != ""} {
+		puts "<tr><th>Recommends</th><td>
+			<a href=/cgi-bin/epg_search.jim?crid=[$rec get event_crid]>
+			<img border=0 height=14
+			    src=/images/421_1_00_CH_Title_2R_Arrow.png>
+			[$rec get name]
+			([$rec get channel_crid][$rec get event_crid])
+			</a>
+		</td></tr>"
+	}
+}
+
+puts "
+	<tr>
+		<td colspan=2 valign=top>
+			[$record channel_icon 70]
+			[join [$record icon_set] "&nbsp;"]
+		</td>
+	</tr>
+	</table>
+
+	<a class=footnote href=/cgi-bin/epg_dump.jim?service=[$record get service_id]&event=[$record get event_id]&raw=1>
+		<img border=0 src=/images/532_1_00_Find_Path_Arrow.png>
+		Show raw EPG info
+	</a>
+"
+
+puts "<div id=epginfo_extra class=footnote></div>"
+
+epg cleanup
+if {! [dict exists $_cgi bare]} { footer }
+

var/mongoose/cgi-bin/epg_schedule.jim

@@ -0,0 +1,83 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require epg.class
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+#set _cgi(service) 4170
+#set _cgi(event) 38584
+#set _cgi(type) 2
+
+if {![dict exists $_cgi service] || ![dict exists $_cgi event]} {
+	puts "Error, insufficient parameters passed."
+	exit
+}
+
+set service $_cgi(service)
+set event $_cgi(event)
+set type 1
+if {[dict exists $_cgi type]} { set type $_cgi(type) }
+
+set event [lindex [epg fetch dump -service $service -event $event] 0]
+if {$event eq ""} {
+	puts "Error, cannot find event to schedule."
+	exit
+}
+if {[$event percent] > 0} {
+	puts "Error, cannot record programme which has already started showing"
+	puts "or occurred in the past."
+	exit
+}
+
+$event get_channel_info
+
+set args {}
+
+set args(ersvtype)		3
+set args(hsvc)			[$event get channel_hsvc]
+set args(nsttime)		[$event get start]
+set args(nduration)		[$event get duration]
+set args(usevtid)		[$event get event_id]
+set args(szevtname)		"\025[$event get name]"
+set args(eReady)		30
+
+set ccrid [$event get channel_crid]
+
+if {$type == 1} {
+	# Event
+	set args(ucCRIDType)		49
+	set args(ucRecKind)		1
+	set args(szCRID) 		"$ccrid[$event get event_crid]"
+	set args(szEventToRecord)	"1$args(szCRID)|"
+} else {
+	# Series
+	set args(ucCRIDType)		50
+	set args(ucRecKind)		4
+	set args(szCRID)		"$ccrid[$event get series_crid]"
+	set args(szFPBRecPath)		"$args(szevtname)"
+	set progs [lmap i [epg fetch dump -scrid [$event get series_crid]] {
+		if {[set ecrid [$i get event_crid]] eq ""} { continue }
+		list "1$::ccrid$ecrid"
+	}]
+	set args(szEventToRecord)	 "[join $progs "|"]|"
+}
+
+#puts $args
+
+set msg ""
+if {![file exists /mod/.schedule.testing]} { set msg "Disabled during testing" }
+if {$msg ne "" || [catch {[rsv new $args] insert} msg]} {
+	puts "Error encountered while scheduling the recording: <i>$msg</i>"
+} else {
+	puts "Successfully scheduled recording of <i>[$event get name]</i>"
+	close [open /tmp/.restartpending w]
+}
+
+epg cleanup
+

var/mongoose/cgi-bin/epg_search.jim

@@ -1,21 +1,28 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
-require epg.class spinner.class altrow settings.class
+source /mod/var/mongoose/lib/setup
+require epg.class spinner.class altrow
+
+puts "Content-Type: text/html"
+puts ""
 
 header
 
-require totop
-
 puts "<script type=text/javascript src=/js/jquery.highlight.js></script>"
 
-set ct [cgi_get ct 0]
-set crid [cgi_get crid ""]
-set scrid [cgi_get scrid ""]
+cgi_input
+#cgi_dump
 
-if {[cgi_exists term]} {
-	set lterm [cgi_get term]
+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 {[string match {CRID:*} $lterm]} {
 		set crid [string range $lterm 5 end]
@@ -38,19 +45,20 @@ require epg_search
 
 require epg_popup
 
+#set _cgi [dict create term "doctor who"]
+#set env(REQUEST_URI) "test"
+
 set cmd "search"
 if {$searchfull} { set cmd "searchall" }
 
-set dedup 0
 if {$ct > 0 } {
 	set records [epg fetch dump -type $ct]
-	if {[[settings] genrededup]} { set dedup 1 }
 } elseif {$crid ne ""} {
 	set records [epg fetch dump -crid $crid]
 } elseif {$scrid ne ""} {
 	set records [epg fetch dump -scrid $scrid]
 } elseif {$searchterm ne ""} { 
-	set records [epg dbfetch $cmd -term $searchterm]
+	set records [epg fetch $cmd -extra $searchterm]
 } else {
 	set records {}
 }
@@ -80,32 +88,20 @@ 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
 	}
 	altrow
 	$record get_channel_info
-
-	set ended [$record ended]
-
-	if $ended { puts "<td nowrap class=blood>" } else { puts "<td nowrap>"}
-	puts "
+	puts "<td nowrap>
 	    [clock format [$record get start] -format "%a %d %b %Y"]<br>
-		[clock format [$record get start] -format "%H:%M %Z"]"
-	puts "</td>"
+		[clock format [$record get start] -format "%H:%M %Z"]</td>"
 	puts "<td>[$record get channel_num]</td>"
 	puts "<td>[$record channel_icon 50]</td>"
 	puts "<td nowrap>
-	    <a href=/cgi-bin/epg/service.jim?service=[$record get service_id]>
+	    <a href=/cgi-bin/epg_service.jim?service=[$record get service_id]>
 	    [$record get channel_name]
 	    </a></td>"
 	puts [$record cell]

var/mongoose/cgi-bin/epg_service.jim

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

var/mongoose/cgi-bin/opkg.jim

@@ -1,7 +1,7 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
+source /mod/var/mongoose/lib/setup
 require pkg.class chunked
 
 cgi_input
@@ -9,30 +9,20 @@ cgi_input
 
 set cmd [cgi_get cmd update]
 
-proc opkg {cmd} {
-	chunk ">>> opkg $cmd\r\n"
-	set bcmd "|/mod/webif/lib/bin/opkg $cmd"
-	set fd [open $bcmd r]
-	while {[gets $fd line] >= 0} {
-		chunk "$line\r\n"
-		#chunk_pad
-	}
-	close $fd
-	chunk "\r\n"
-}
-
 start_chunked
 
-if {$cmd eq "upgrade"} { opkg update }
-opkg $cmd
+set bcmd "|/mod/var/mongoose/lib/opkg $cmd"
+set fd [open $bcmd r]
+while {[gets $fd line] >= 0} {
+	chunk "$line\r\n"
+	#chunk_pad
+}
+close $fd
 
-if {$cmd eq "update" || $cmd eq "upgrade"} {
+if {$cmd eq "update"} {
 	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/pkg.jim

@@ -1,24 +1,26 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
+source /mod/var/mongoose/lib/setup
 require settings.class pkg.class altrow
 
 if {[[settings] pkgdev]} { set filter 0 } else { set filter 1 }
 
-httpheader
+puts "Content-Type: text/html"
+puts "Pragma: no-cache"
+puts "Expires: Thu, 01 Jan 1970 00:00:00 GMT"
+puts ""
+
+cgi_input
+#cgi_dump
+if {![dict exists $_cgi type]} { set _cgi(type) avail }
 
 proc pkgrow {pkg} {
 	set name [$pkg get name]
-	altrow "pkg=\"$name\""
-	puts "<td nowrap>$name"
-	if {$::type eq "inst"} {
-		puts "<br><a href=# class=depends>&nbsp;&nbsp;
-		    <img class=va border=0
-		    src=/images/421_1_00_CH_Title_2R_Arrow.png height=14>
-		    <span class=\"va footnote\">Info</span></a>"
-	}
-	puts "</td>"
+	altrow
+	puts "
+		<td nowrap>$name</td>
+	"
 
 	if {$::type eq "avail"} {
 		puts "<td nowrap>[$pkg get latest]</td>"
@@ -44,16 +46,16 @@ proc pkgrow {pkg} {
 		set type Remove
 	}
 
-	puts "<td align=center><small><button id=\"$name\"
+	puts "<td align=center><small><button id=\"[$pkg get name]\"
 	    action=[string tolower $type]
-	    class=\"va [string tolower $type]\">$type</button></small></td>"
+	    class=[string tolower $type]>$type</button></small></td>"
 
 	puts "</tr>"
 }
 
 pkg loadmeta
 
-set type [cgi_get type "avail"]
+set type $_cgi(type)
 
 set pkgs [pkg $type]
 
@@ -77,8 +79,7 @@ if {[llength $pkgs] > 0} {
 	"
 
 	foreach pkg $pkgs {
-		if {$type ne "upgr" && $filter && \
-		    ![dict exists $::pkgmeta $pkg]} { continue }
+		if {$filter && ![dict exists $::pkgmeta $pkg]} { continue }
 		pkgrow [pkg load $pkg]
 	}
 	puts "</table>"
@@ -89,7 +90,7 @@ if {[llength $pkgs] > 0} {
 	puts "<i>No packages "
 	switch $type {
 		inst { puts "are installed." }
-		upgr { puts "are available for upgrade; try updating the package list from the Internet using the button above." }
+		upgr { puts "are available for upgrade." }
 		avail { puts "are available for installation." }
 	}
 	puts "</i>"

var/mongoose/cgi-bin/restart.jim

@@ -1,59 +1,9 @@
 #!/mod/bin/jimsh
 
-package require cgi
-source /mod/webif/lib/setup
-require rsv.class system.class
+puts "Content-Type: text/html"
+puts ""
 
-httpheader
-
-if {[cgi_get act] eq "cancel"} {
-	file delete /tmp/.restartpending
-	exit
-}
-
-if {[cgi_get now] eq "yes"} {
-	# - Busybox reboot does sync the disk but may still not be clean enough.
-	puts "Restarting."
-	system reboot
-	exit
-}
-
-file delete /tmp/.restartpending
-header
-
-# Commit pending reservations on older mod versions.
-if {![file exists /sbin/rsvsync] && ![file exists /mod/boot/rsvsync]} {
-	rsv commit
-}
-
-puts { 
-<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
-<script type="text/javascript" src="/js/jquery.progressbar.js"></script>
-
-<script type=text/javascript>
-	var handle = 0;
-	var pct = 0;
-	function update()
-	{
-		$('#progressbar').reportprogress(++pct);
-		if (pct == 100)
-		{
-			clearInterval(handle);
-			pct = 0;
-			window.location = '/';
-		}
-	}
-
-	$(document).ready(function() {
-		$('#progressbar').reportprogress(0);
-		handle = setInterval("update()", 350);
-		$.get('/cgi-bin/restart.jim?now=yes');
-	});
-</script>
-
-Please wait while the Humax restarts...<br>
-<div id=progressbar></div>
-}
-
-footer
+#puts [exec /etc/init.d/S90settop restart]
+#file delete /tmp/.restartpending
+puts [exec killall humaxtv]
 

var/mongoose/cgi-bin/restartblock.jim

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

var/mongoose/cgi-bin/service.jim

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

var/mongoose/cgi-bin/settings.jim

@@ -1,52 +1,22 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
-require settings.class plugin system.class
+source /mod/var/mongoose/lib/setup
+require settings.class
+require plugin
 
-httpheader
+puts "Content-Type: text/html"
+puts ""
 
-if {[cgi_get act] eq "https"} {
-	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 {
-		exec /mod/sbin/mongoose_mkcert
-		puts "HTTPS Server will be enabled after next reboot."
-	}
-	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
-}
+cgi_input
+#cgi_dump
 
 set settings [settings new]
 
 set hostname [$settings hostname]
 set smtp_server [$settings smtp_server]
 set channel_group [$settings channel_group]
-set epg_style [$settings epg_style]
 set pkgdev [$settings pkgdev]
-set notoolbar [$settings notoolbar]
-set nomobile [$settings nomobile]
-set nohelplinks [$settings nohelplinks]
-set notwitfeed [$settings notwitfeed]
-set nounwatchedcount [$settings nounwatchedcount]
-set chanchangenc [$settings chanchangenc]
-set xepghours [$settings xepghours]
-if {$xepghours == 0} { set xepghours 4 }
-set genrededup [$settings genrededup]
-set autolog [$settings autolog]
 
 # Handle updates
 
@@ -81,76 +51,40 @@ 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"
+if {[dict exists $_cgi pkgdevoff] && ![dict exists $_cgi pkgdev]} {
+	set _cgi(pkgdev) 0
+}
 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 notwitfeed $notwitfeed "Disable twitter feed ticker"
-handle_int_update chanchangenc $chanchangenc \
-    "Disable channel change confirmation"
-handle_int_update nounwatchedcount $nounwatchedcount "Disable unwatched count"
-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 "-"]
-set aclpassc [cgi_get aclpassc "-"]
-if {$acluser ne "-" && $aclpass ne "-"} {
-	if {![string length $acluser]} {
-		puts "No username provided."
-		exit
-	}
-	if {$aclpass ne $aclpassc} {
-		puts "Passwords do not match."
-		exit
-	}
-	if {[string length $aclpass] < 4} {
-		puts "Password is too short (< 4 characters)"
-		exit
-	}
-	puts [$settings addacluser $acluser $aclpass]
-	exit
-}
-
-set aclact [cgi_get aclact "-"]
-if {$aclact ne "-" && $acluser ne "-"} {
-	switch $aclact {
-		"del" { puts [$settings delacluser $acluser] }
-	}
-	exit
-}
 
 header
 
-puts {
-<script type="text/javascript" src="/cgi-bin/settings.js"></script>
-<script type="text/javascript" src="/js/jquery.form.js"></script>
-<script type="text/javascript" src="/js/iphone-style-checkboxes.js"></script>
-<link href=/css/iphone-style-checkboxes.css rel=stylesheet type=text/css />
-<div id=accordion>
-}
+puts {<script type="text/javascript" src="/js/jquery.form.js"></script>}
 
-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 {
+	<script type=text/javascript>
+	$(document).ready(function () {
+		$(":submit").button();
+		$('form.auto').each(function(i, el) {
+			var id = $(this).attr('id');
+			var output = '#' + id + '_output'
+			$(this).ajaxForm({
+				target: output,
+				success: function() {
+				    $(output).css('font-style', 'italic');
+				    $(output).show('slow');
+				    $(output).delay(2000).fadeOut('slow');
+				}
+			});
+		});
+	});
+	</script>
 }
 
 puts "
-	<h4>General Settings</h4>
-	<div><fieldset style=\"display: inline\">
+<link href=/css/iphone-style-checkboxes.css rel=stylesheet type=text/css />
+<script type=\"text/javascript\" src=\"/js/iphone-style-checkboxes.js\">
+</script>
+	<fieldset style=\"display: inline\">
 		<legend>
 			General Settings
 		</legend>
@@ -173,86 +107,13 @@ puts "
 	</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
-setting_toggle "Twitter feed ticker on main page?" "notwitfeed" $(!$notwitfeed) 1
-setting_toggle "Unwatched count on folders?" "nounwatchedcount" $(!$nounwatchedcount) 1
-if {[system pkginst ir]} {
-	setting_toggle "Disable channel change confirmation?" \
-	    "chanchangenc" $chanchangenc 0
-}
-
-puts -nonewline "
-	<tr>
-	<form class=auto id=autolog method=get action=$env(REQUEST_URI)>
-		<th class=key>Auto-processing log level</th>
-		<td><select id=autolog name=autolog
-		    class=\"text ui-widget-content ui-corner-all\">
-"
-puts "<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 "
-</table></fieldset></div>
-
-<h4>EPG Settings</h4>
-<div><fieldset style=\"display: inline\">
-	<legend>
-		EPG Settings
-	</legend>
-<table>
-"
-
-puts "
-	<tr>
-	<form class=auto id=epg_style method=get action=$env(REQUEST_URI)>
-		<th class=key>Default Now/Next style</th>
-		<td><select id=epg_style name=epg_style
-		    class=\"text ui-widget-content ui-corner-all\">
-"
-puts "<option value=standard"
-if {$epg_style ne "grid"} { puts " selected" }
-puts ">Standard\n"
-puts "<option value=grid"
-if {$epg_style eq "grid"} { puts " selected" }
-puts ">Grid\n"
-puts "
-		</select>
-		<small>
-		<input name=epg_style value=\"set\" type=submit>
-		</small>
-		<div id=epg_style_output></div>
-		</td>
-	</form>
-	</tr>
-"
-
 puts "
 	<tr>
 	<form class=auto id=channel_group method=get action=$env(REQUEST_URI)>
 		<th class=key>Channel Group for EPG</th>
 		<td><select id=channel_group name=channel_group
-		    class=\"text ui-widget-content ui-corner-all\">
+		    class=\"text ui-widget-content ui-corner-all\"
+		    value=[$settings channel_group]>
 "
 
 set i 0
@@ -278,191 +139,64 @@ puts "
 "
 
 puts "
-	<tr>
-	<form class=auto id=xepghours method=get action=$env(REQUEST_URI)>
-		<th class=key>Grid-style EPG Hours</th>
-		<td><select id=xepghours name=xepghours
-		    class=\"text ui-widget-content ui-corner-all\">
+	</table>
+	</fieldset>
+	<br><br>
+	<fieldset style=\"display: inline\">
+	<legend> Email Settings </legend>
+	<table>
 "
 
-foreach xehopt {2 3 4 5 6} {
-	puts -nonewline "<option value=$xehopt"
-	if {$xehopt == $xepghours} {
-		puts -nonewline " selected"
-	}
-	puts ">$xehopt hours"
-}
-
 puts "
-		</select>
-		<small>
-		<input name=xepghours value=\"set\" type=submit>
-		</small>
-		<div id=xepghours_output></div>
+	<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>
 "
 
-setting_toggle "De-duplicate genre search results?" genrededup $genrededup
-
 puts "
 	</table>
-	</fieldset></div>
-"
-
-#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 "
-	<h4>Web Interface User Access Control</h4>
-	<div>
-	<fieldset style=\"display: inline\">
-	<legend> Web Interface User Access Control </legend>
-	<table>
-"
-
-set aclusers [$settings aclusers]
-if {[llength $aclusers]} {
-	puts "<tr><th colspan=5 class=odd>Existing Users</th></tr>"
-	foreach user [$settings aclusers] {
-		lassign $user user
-		puts "<tr><td align=center style=\"font-weight: bold\">
-		    $user</td>"
-		puts "<th class=key>New password:
-	        <input
-		  class=\"aclpass text ui-widget-content ui-corner-all\"
-		  type=password size=20 maxlength=50><br>"
-		puts "Again:
-	        <input
-		  class=\"aclpassc text ui-widget-content ui-corner-all\"
-		  type=password size=20 maxlength=50></td>"
-		puts "<th class=key><button class=pwchange>
-		    Change</button></td>"
-		puts "<th class=key><button class=userdel>
-		    Delete User</button></td>"
-		puts "</tr>"
-	}
-	puts "<tr><td colspan=5 id=aclusermod_output>&nbsp;</td></tr>"
-	puts "<tr><td colspan=5>&nbsp;</td></tr>"
-} else {
-	puts "<tr><td colspan=5 class=blood><b>
-	    Add a user to enable authentication.</b></td></tr>"
-}
-
-puts "<tr><th colspan=5 class=odd>Add New User</th></tr>"
-puts "
-	<form id=aclnewuser method=get action=$env(REQUEST_URI)>
-	<tr><th class=key>New User:</th><td>
-	    <input
-		class=\"text ui-widget-content ui-corner-all\"
-		id=acluser name=acluser size=20 maxlength=50></td></tr>
-	<tr><th class=key>Password:</th><td>
-	    <input type=password
-		class=\"text ui-widget-content ui-corner-all\"
-		id=aclpass name=aclpass size=20 maxlength=50></td></tr>
-	<tr><th class=key>Password (confirm):</th><td>
-	    <input type=password
-		class=\"text ui-widget-content ui-corner-all\"
-		id=aclpassc name=aclpassc size=20 maxlength=50></td></tr>
-	<tr><td><input id=aclnewuser_submit value=\"Add User\" type=submit>
-	    </td></tr>
-	</form>
-	</table>
-	<div id=aclnewuser_output></div>
 	</fieldset>
-	</div>
-"
-
-puts {
-<script type=text/javascript>
-$('#aclnewuser').ajaxForm({
-	target: '#aclnewuser_output',
-	success: function(txt) {
-		if (txt.indexOf('Success') >= 0)
-			window.location.reload(true);
-	}
-});
-
-$('button.userdel').click(function(el) {
-	var user = $('td:first', $(this).parents('tr')).text().trim();
-	$('#aclusermod_output').load(
-	    '/cgi-bin/settings.jim?aclact=del&acluser=' +
-	    encodeURIComponent(user), function(txt) {
-		if (txt.indexOf('Success') >= 0)
-			window.location.reload(true);
-	});
-});
-
-$('button.pwchange').click(function(el) {
-	var tr = $(this).parents('tr');
-	var user = $('td:first', $(tr)).text().trim();
-	var pass = $(tr).find('input.aclpass').val();
-	var passc = $(tr).find('input.aclpassc').val();
-	$('#aclusermod_output').load('/cgi-bin/settings.jim?' +
-	    'acluser=' + encodeURIComponent(user) + '&' +
-	    'aclpass=' + encodeURIComponent(pass) + '&' +
-	    'aclpassc=' + encodeURIComponent(passc));
-});
-</script>
-}
-
-puts -nonewline "
-	<h4>Advanced Settings</h4>
-	<div>
+	<br><br>
 	<fieldset style=\"display: inline\">
 	<legend> Advanced Settings </legend>
 	<table>
 "
-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 "
+	<tr>
+	<form class=auto id=pkgdev method=get action=$env(REQUEST_URI)>
+		<th class=key>Show development and advanced packages?</th>
+		<td><input name=pkgdevoff value=0 type=hidden>
+		    <input name=pkgdev id=pkgdev value=1 type=checkbox
+"
+if {$pkgdev} { puts " checked" }
+puts {
+		>
+		    <small>
+		    <input id=pkgdev_submit value="save" type=submit>
+		    </small>
+		    <div id=pkgdev_output></div>
+		</td>
+	</form>
+	</tr>
 }
 
 puts "
 	</table>
 	</fieldset>
-	</div>
 "
 
-set hook settings
-foreach plugin [lsort [glob -nocomplain /mod/webif/plugin/*]] {
-	if {[file isfile "$plugin/$hook.hook"]} {
-		puts "<h4>Settings for <i>[file tail $plugin]</i> package</h4>"
-		puts "<div class=pluginsettings>"
-		catch {source "$plugin/$hook.hook"}
-		puts "</div>"
-	} 
-}
-
-puts "</div>"
+eval_plugins settings
 
 footer
 

var/mongoose/cgi-bin/settings.js

@@ -1,86 +0,0 @@
-(function($)
-{
-	$.fn.enable = function()
-	{
-		return this.each(function() {
-			$(this)
-			    .removeClass('ui-state-disabled')
-			    .removeProp('disabled');
-		});
-	};
-
-	$.fn.disable = function()
-	{
-		return this.each(function() {
-			$(this)
-			    .addClass('ui-state-disabled')
-			    .prop('disabled', true);
-		});
-	};
-})(jQuery);
-
-$(document).ready(function () {
-	$(":submit").button();
-	//$('[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';
-		$(this).ajaxForm({
-			target: output,
-			success: function() {
-			    $(output)
-				.css('font-style', 'italic')
-			    	.show('slow')
-			    	.delay(2000)
-				.fadeOut('slow');
-			}
-		});
-	});
-
-	$('.setting_toggle').change(function() {
-		var arg = '0';
-		var urlargs;
-		if ($(this).attr('checked'))
-			arg = '1';
-
-		if ($(this).attr('invert'))
-			arg = arg == "0" ? "1" : "0";
-
-		var el = $(this);
-		var attr = $(this).attr('attr');
-		var output = '#' + attr + '_output';
-
-		if ($(this).attr('useval'))
-			urlargs = 'act=' + attr + '&val=' + arg;
-		else
-			urlargs = attr + '=' + arg;
-
-		$(this).disable();
-
-		$(output)
-		    .empty()
-		    .show('slow')
-		    .load('/cgi-bin/settings.jim?' + urlargs,
-		        function() {
-				$(el).enable();
-				$(output)
-				    .css('font-style', 'italic')
-				    .delay(2000).fadeOut('slow');
-		    });
-	});
-
-	$('#accordion').accordion({
-	    header: 'h4',
-	    collapsible: true,
-	    active: 0,
-	    heightStyle: 'content'
-	});
-
-	// For now - until plugins are updated.
-	$('div.pluginsettings').find('br + br').remove();
-});
-

var/mongoose/cgi-bin/status.jim

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

var/mongoose/cgi-bin/transmission.jim

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

var/mongoose/cgi-bin/xepg.jim

@@ -1,262 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-require settings.class
-
-header
-
-require epg.class spinner.class altrow epg_search totop system.class
-
-set irinst [system pkginst ir]
-
-puts {
-<link type="text/css" href="/css/xepg.css" rel="Stylesheet" />
-<script type=text/javascript src=/js/enadis.js></script>
-<script type=text/javascript src=xepg.js></script>
-}
-
-if {[[settings] chanchangenc]} {
-	puts { <script type=text/javascript src=/js/chanchangenc.js></script> }
-} else {
-	jqplugin confirmAction
-	puts { <script type=text/javascript src=/js/chanchange.js></script> }
-}
-
-[spinner new {
-	text "Loading EPG Information..."
-	size "1.2em"
-	style "margin: 1em;"
-	}] start
-
-require epg_popup
-
-set now [clock seconds]
-set stt [cgi_get stt $now]
-if {$stt <= $now} {
-	set stt $now
-	set current 1
-} else {
-	set current 0
-}
-
-set favgroup [[settings] channel_group]
-
-set hours [expr 1.0 * [[settings] xepghours]]
-if {$hours == 0} { set hours 4.0 }
-set seconds $($hours * 3600)
-
-set ostt $stt
-set stt [expr int($stt / 1800.0) * 1800]
-
-set ett $(int($stt + $seconds))
-set offset $(($ostt - $stt) / 1800.0)
-
-set chanpx 160
-set eventpx 1000
-set totalpx $($chanpx + $eventpx)
-set contwidth $($totalpx + 50)
-
-set hourpx $($eventpx / $hours)
-set minpx $($hourpx / 60.0)
-set secpx $($minpx / 60.0)
-
-set start [clock milliseconds]
-if {$::qepg} {
-	if {$favgroup} {
-		set records [epg dbfetch dump \
-		    -trange "$stt:$ett" -fav $favgroup]
-	} else {
-		set records [epg dbfetch dump -trange "$stt:$ett"]
-	}
-
-} else {
-	require channelsort
-	set records [channelsort [epg fetch dump -trange "$stt:$ett"]]
-}
-set got [clock milliseconds]
-
-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 "<!-- 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 "&lt; Now &gt;" $now
-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/%m/%Y}]
-puts "<input type=hidden id=xepg_dp stt=$stt>"
-puts "</div>"
-
-puts "<div class=xechan style=\"width: ${chanpx}px;\">&nbsp;</div>"
-for {set i 0} {$i < $hours * 2} {incr i} {
-	puts "<div class=xetime id=xe$i
-	    style=\"width: [expr $minpx * 30]px\">"
-	puts "[clock format $($stt + 1800 * $i) -format "%H:%M"]</div>"
-}
-
-set lim 0
-set lcn 0
-set bg "odd"
-
-foreach e $records {
-	set chnum [$e get channel_num]
-	if {$chnum == 0} { continue }
-
-	if {$chnum != $lcn} {
-		puts "<div class=xechan style=\"width: ${chanpx}px;\">"
-
-		if {$irinst} {
-			puts "<a class=chanchange chan=$chnum href=#>"
-		}
-		puts "[$e channel_icon 30]&nbsp;"
-		if {$irinst} { puts "</a>" }
-		puts "$chnum
-	    <a href=\"/cgi-bin/epg/service.jim?service=[$e get service_id]\"
-		title=\"[$e get channel_name]\">
-	    [$e get channel_name]
-	    </a></div>"
-
-		set lcn $chnum
-		set le 0
-		set pos 0
-		if {$bg eq "odd"} { set bg "even" } else { set bg "odd" }
-	}
-
-	set es [$e get start]
-	set ee [expr $es + [$e get duration]]
-
-	if {$es < $le} continue
-
-	if {$es < $stt} { set es $stt }
-	if {$ee > $ett} { set ee $ett }
-	set le $ee
-
-	set left [expr int(($es - $stt) * $secpx)]
-	set right [expr int(($ee - $stt - 1) * $secpx)]
-	set px $($right - $left)
-	if {$pos < $left} {
-		set px $($px + $left - $pos - 1)
-	} elseif {$pos > $left} {
-		set px $($px - ($pos - $left - 1))
-	}
-	incr pos $px
-
-	$e process_sched
-
-	set recopts 1
-	if {[$e get series_crid] ne ""} { set recopts 2 }
-
-	set perc [$e percent]
-	set showing 0
-	if {$perc > 0 && $perc < 100} { set showing 1 }
-
-	set txt "[cgi_quote_html [$e get name]] <span>([\
-	    clock format $es -format "%H:%M"] - [\
-	    clock format $ee -format "%H:%M"])"
-	if {$showing} { append txt " ($perc%)" }
-	append txt "</span>"
-
-	set htxt "[cgi_quote_html [$e get name]] ([\
-	    clock format $es -format "%H:%M"] - [\
-	    clock format $ee -format "%H:%M"])"
-	if {$showing} { append hxt " ($perc%)" }
-
-	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]
-		rec=$recopts>"
-	puts $txt
-	puts "</a>"
-	puts "</div>"
-}
-puts "<div id=keypos style=\"float: left; clear: left;\"></div>"
-puts "</div>"
-puts "</div>"
-
-set earlier $($stt - 3600 * 4)
-
-puts "
-
-<div style=\"clear: both;\">
-<small><button id=epgswitch>
-	Switch to standard now/next display.
-</button></small>
-</div>
-"
-
-if {$current} {
-	puts "
-		<script type=text/javascript>
-		\$(function() {
-	"
-	puts {
-
-var kt = $('#xe0');
-var ktpos = kt.position();
-
-var height = $('#keypos').position().top - ktpos.top;
-
-	}
-	puts "var nowpos = ktpos.left + (kt.width() * $offset);"
-	puts {
-$('#xepgnow')
-	.css('left', nowpos + 'px')
-	.css('top', ktpos.top)
-	.height(height)
-	.show('slow');
-	}
-
-	puts "
-		});
-		</script>
-	"
-}
-
-puts "
-	<a href=/cgi-bin/settings.jim>
-	<img border=0 height=14 src=/images/421_1_00_CH_Title_2R_Arrow.png>
-	Visit settings to change EPG options.
-	</a><br>
-"
-
-epg cleanup
-
-set end [clock milliseconds]
-puts "<font class=footnote>
-    Retrieved in: [expr [expr $got - $start] / 1000.0] seconds.
-    </font>"
-
-footer
-

var/mongoose/cgi-bin/xepg.js

@@ -1,38 +0,0 @@
-$(function() {
-
-$('#epgswitch').button().click(function() {
-	window.location = '/epg.shtml';
-});
-
-$('button.nav').click(function() {
-        window.location = '/cgi-bin/xepg.jim?stt=' + $(this).attr('tt') +
-            '&pos=' + $('#xegrid').scrollTop();
-});
-
-$('#xepg_dp').datepicker({
-        buttonImage: '/img/cal.gif',
-        buttonImageOnly: true,
-        showOn: 'button',
-        dateFormat: '@',
-        minDate: 0,
-        maxDate: 8,
-        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'); }
-);
-
-});
-

var/mongoose/html/backup.shtml

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

var/mongoose/html/browse/aexpiry.jim

@@ -1,24 +0,0 @@
-#!/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

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

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

@@ -1,47 +0,0 @@
-#!/mod/bin/jimsh
-
-package require sqlite3
-package require cgi
-source /mod/webif/lib/setup
-require ts.class system.class
-
-header
-
-set rfile [cgi_get file]
-set ts [ts fetch $rfile]
-set dir [file dirname $rfile]
-set len [$ts duration 1]
-
-puts "
-<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
-<script type=text/javascript src=/js/jquery.progressbar.js></script>
-<script type=text/javascript src=audio.js></script>
-
-<fieldset class=cleft>
-<legend>Audio Extraction</legend>
-
-<table class=keyval cellpadding=5>
-<tr><th>File:</th><td>$rfile</td></tr>
-<tr><th>Length:</th><td>[clock format $len -format "%T"]</td></tr>
-</table>
-
-<span class=hidden id=params
-    dir=\"[cgi_quote_url $dir]\"
-    rfile=\"[cgi_quote_url $rfile]\"
-></span>
-
-<div id=audiodiv style=\"padding: 1em\">
-<button id=audioit>Perform audio extraction</button>
-</div>
-
-<div id=progressdiv class=hidden>
-Extracting audio: <div id=progressbar></div>
-</div>
-
-<button id=back class=hidden>Back to media list</button>
-
-<div id=output class=pre style=\"margin-top: 10px\"></div>
-</fieldset>
-
-"
-

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

@@ -1,35 +0,0 @@
-
-var handle = 0;
-
-function update()
-{
-	$.get('progress.jim?file=' + $('#params').attr('rfile'),
-	    function(data) {
-		if (handle)
-			$('#progressbar').reportprogress(data);
-	});
-}
-
-$(document).ready(function() {
-
-$('#progressbar').reportprogress(0);
-
-$('#back').button().click(function() {
-	window.location = '../index.jim?dir=' + $('#params').attr('dir');
-});
-
-$('#audioit').button().click(function() {
-	$('#audiodiv').hide('slow');
-	$('#progressdiv').show('slow');
-	handle = setInterval("update()", 1000);
-	$('#output').load('execute.jim?file=' + $('#params').attr('rfile'),
-	    function() {
-		clearInterval(handle);
-		handle = 0;
-		$('#back').show();
-		$('#progressbar').reportprogress(100);
-	});
-});
-
-});
-

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

@@ -1,36 +0,0 @@
-#!/mod/bin/jimsh
-
-package require sqlite3
-package require cgi
-source /mod/webif/lib/setup
-require ts.class system.class
-
-httpheader
-
-set rfile [cgi_get file]
-set ts [ts fetch $rfile]
-set dir [file dirname $rfile]
-set len [$ts duration 1]
-
-set xstart [clock milliseconds]
-
-set base [file rootname $rfile]
-set shname [file tail $base]
-puts "Processing $shname"
-
-puts [exec /mod/bin/ffmpeg -y -benchmark -v 0 \
-    -i $rfile -f mp3 \
-    -vn -acodec copy "${base}.mp3"]
-
-if {[system pkginst id3v2]} {
-	puts [exec /mod/bin/id3v2 \
-	    --song "[$ts get title]" \
-	    --comment "[$ts get synopsis]" \
-	    --album "[$ts get channel_name]" \
-	    --year "[clock format [$ts get start] -format {%Y}]" \
-	    "${base}.mp3"]
-}
-
-set xtime [expr [expr [clock milliseconds] - $xstart] / 1000.0]
-puts "Time taken: $xtime"
-

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

@@ -1,23 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-require ts.class
-
-httpheader
-
-set tsfile [cgi_get file]
-set rfile [file normalize $tsfile]
-set bfile [file rootname $rfile]
-
-if {![file exists "${bfile}.mp3"]} {
-	puts "0"
-} else {
-	set sz [file size $rfile]
-	set nsz [expr [file size "${bfile}.mp3"] / 0.3]
-
-	set perc [expr $nsz * 100 / $sz]
-	if {$perc > 100} { set perc 100 }
-	puts $perc
-}
-

var/mongoose/html/browse/bmp.jim

@@ -1,19 +0,0 @@
-#!/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.css

@@ -1,6 +0,0 @@
-
-div.progressbar
-{
-	width: 200px;
-}
-

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

@@ -1,67 +0,0 @@
-#!/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]
-
-# 45 minute chunks
-set max $(45 * 60)
-
-set len [$ts duration 1]
-
-set esttime $(int($len * 0.025))
-if {[$ts get definition] eq "HD"} { set esttime $($esttime * 4) }
-
-puts "
-<script type=text/javascript src=/js/jquery.progressbar.js></script>
-<script type=text/javascript src=chunk.js></script>
-<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
-<link href=chunk.css rel=stylesheet type=text/css />
-
-<fieldset class=cleft>
-<legend>Split recording into 45 minute segments</legend>
-<table class=keyval cellpadding=5>
-<tr><th>File:</th><td>$rfile</td></tr>
-<tr><th>Length:</th><td>[clock format $len -format "%T"]</td></tr>
-<tr><th>Size:</th><td>[pretty_size [$ts size]] ([$ts get definition])</td></tr>
-<tr><th>Time:</th>
-<td>Splitting will take around [clock format $esttime -format "%T"]</td></tr>
-"
-
-set bytesperminute $([$ts size] / ($len / 60))
-
-while {$len > 0} {
-	incr part
-	incr len -$max
-	puts "<tr class=\"part hidden\">
-		<th>Part $part</th><td>
-		    <div id=progresspart$part class=progressbar></div>
-		    <div id=progressstat$part class=also>waiting...</div>
-		</td></tr>"
-}
-
-puts "
-</table>
-<span class=hidden id=params parts=$part bpm=$bytesperminute
-    file=\"[cgi_quote_url $rfile]\">
-</span>
-
-<div id=chunkdiv style=\"padding: 1em\">
-<button id=chunkit>Split recording into $part parts</button>
-</div>
-
-<div id=findiv style=\"padding: 1em\" class=hidden>
-<button id=back dir=\"[cgi_quote_url [file dirname $rfile]]\">
-Back to Media Browser
-</button>
-</div>
-
-</fieldset>
-"
-

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

@@ -1,76 +0,0 @@
-var handle;
-var currentpart = 0;
-var stime = 0;
-
-function xprogress()
-{
-	var file = $('#params').attr('file');
-	var bpm = $('#params').attr('bpm');
-
-	if (currentpart > 0)
-		$.get('progress.jim?part=' + currentpart + '&file=' + file,
-		    function(data) {
-			if (currentpart > 0)
-			{
-				perc = (data / bpm) * 100 / 45;
-				$('#progresspart' + currentpart)
-				    .reportprogress(perc);
-			}
-		    });
-}
-
-function xpart(part)
-{
-	var parts = $('#params').attr('parts');
-	var file = $('#params').attr('file');
-
-	if (part++ < parts)
-	{
-		currentpart = part;
-		$('#progressstat' + part)
-		    .text('extracting...')
-		    .addClass('blood');
-		stime = new Date().getTime();
-		$.get('extract.jim?parts=' + parts +
-		    '&part=' + part +
-		    '&file=' + file,
-		    function(data) {
-			var taken = (new Date().getTime() - stime) / 1000;
-			$('#progressstat' + part)
-			    .text('done... (' + taken + ' seconds)')
-			    .removeClass('blood');
-			currentpart = 0;
-			$('#progresspart' + part)
-			    .reportprogress(100);
-			xpart(part);
-		});
-	}
-	else
-	{
-		clearInterval(handle);
-		$('#findiv').show('slow');
-	}
-}
-
-$(function() {
-
-$('div.progressbar').reportprogress(0);
-
-$('#chunkit').button().click(function(e) {
-	e.preventDefault();
-	$('#chunkdiv').hide('slow');
-	$('tr.part').show('slow');
-
-	handle = setInterval("xprogress()", 1000);
-	xpart(0);
-});
-
-$('#back').button().click(function(e) {
-	e.preventDefault();
-	var dir = $(this).attr('dir');
-
-	window.location = '../index.jim?dir=' + dir;
-});
-
-});
-

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

@@ -1,35 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-require ts.class pretty_size
-
-httpheader
-
-set rfile [cgi_get file]
-set part [cgi_get part -]
-set parts [cgi_get parts "?"]
-
-if {$part eq "-"} exit
-
-set start $(($part - 1) * 45 * 600 - 600)
-set end $($part * 45 * 600 + 600)
-
-puts "START: $start"
-puts "END: $end"
-
-set ts [ts fetch $rfile]
-
-set base [file rootname $rfile]
-
-set cmd [list /mod/bin/nicesplice -in $base -out "$base.part$part"]
-if {$start > 0} { lappend cmd -cut 0 $start }
-lappend cmd -cut $end 9999999
-
-puts "CMD: ($cmd)"
-
-puts [exec {*}$cmd]
-
-set ts [ts fetch "$base.part$part.ts"]
-$ts settitle "$part/$parts. [string range [ts get $title] 0 40]"
-

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

@@ -1,14 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-require ts.class
-
-heepheader
-
-set file [cgi_get file]
-set part [cgi_get part]
-
-set rfile "[file rootname $file].part$part"
-puts [file size $rfile]
-

var/mongoose/html/browse/clipboard.jim

@@ -1,122 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-require clipboard.class ts.class
-
-httpheader
-
-cgi_input 1
-
-set cb [[clipboard new {path "/tmp/webif-browse.cb"}] load]
-
-set action [cgi_get act list]
-
-switch $action {
-    list {
-	if {![$cb size]} {
-		puts "<i>Clipboard is empty</i>"
-		break
-	}
-	puts "<div class=cliplist>"
-	foreach file [$cb get items] {
-		set img "page_white_copy"
-		if {[$file get action] eq "cut"} {
-			set img "cut"
-		}
-		set path [$file get path]
-		set xpath [cgi_quote_html $path]
-		puts "<span title=\"$xpath\" alt=\"$xpath\">"
-		puts "<img src=/img/context/$img.png>"
-		set dfile [file tail $path]
-		if {[string length $dfile] > 25} {
-			set dfile "[string range $dfile 0 22]..."
-		}
-		if {[file isdirectory $path]} {
-			puts "<img height=16
-			    src=/images/711_1_09_Media_Folder.png>"
-		}
-		puts [cgi_quote_html $dfile]
-		puts "<a class=clipdel href=# alt=\"Remove\" title=\"Remove\"
-		    path=\"[cgi_quote_url $path]\">
-		    <img border=0 src=/img/close.png height=16></a>"
-		puts "</span>"
-	}
-	puts "</div>"
-	puts "<button id=paste>Paste to current folder</button>"
-	puts "<button id=clipclear>Empty clipboard</button>"
-    }
-    add {
-	if {[set path [cgi_get path]] eq "0"} {
-		puts "No path."
-		exit
-	}
-	set dir [cgi_unquote_input [cgi_get dir]]
-	set mode [cgi_get mode copy]
-	foreach p $path {
-		set p [cgi_unquote_input $p]
-		if {$dir ne "0" && [string first "$dir/" $p] != 0} {
-			puts "$p not in directory<br>"
-			continue
-		}
-		if {![$cb present $p]} {
-			$cb add $mode $p
-			puts "Added $p for $mode<br>"
-		}
-	}
-	$cb save
-    }
-    remove {
-	$cb remove [cgi_unquote_input [cgi_get path]]
-	$cb save
-    }
-    clear {
-	$cb clear
-	$cb save
-    }
-    paste {
-	set dir [cgi_unquote_input [cgi_get dir]]
-	foreach item [$cb get items] {
-		set path [$item get path]
-		set file [file tail $path]
-		set mode [$item get action]
-
-		puts "Pasting $file"
-
-		if {[file isdirectory $path]} {
-			# Directory
-			if {$mode eq "cut"} {
-				catch {file rename $path "$dir/$file"}
-			} else {
-				catch {puts [exec /mod/bin/busybox/cp -r \
-				    $path $dir]}
-			}
-		} elseif {[string match {*.ts} $path]} {
-			set ts [ts fetch $path]
-			if {![catch {$ts get file}]} {
-				foreach f [$ts fileset] {
-					if {$mode eq "cut"} {
-						catch {file rename $f \
-						    "$dir/[file tail $f]"}
-					} else {
-						catch {file copy $f \
-						    "$dir/[file tail $f]"}
-					}
-				}
-			}
-		} else {
-			if {$mode eq "cut"} {
-				catch {file rename $path \
-				    "$dir/[file tail $path]"}
-			} else {
-				catch {file copy $path \
-				    "$dir/[file tail $path]"}
-			}
-		}
-		ts resetnew $dir
-	}
-	$cb clear
-	$cb save
-    }
-}
-

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

@@ -1,112 +0,0 @@
-#!/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]
-
-puts "
-<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
-<script type=text/javascript src=/js/jquery.progressbar.js></script>
-<script type=text/javascript src=crop.js></script>
-
-<fieldset class=cleft>
-<legend>Crop recording</legend>
-
-<table class=keyval cellpadding=5>
-<tr><th>File:</th><td>$rfile</td></tr>
-<tr><th>Length:</th><td>[clock format $len -format \"%T\"]</td></tr>
-<tr><th>Size:</th><td>[pretty_size [$ts size]] ([$ts get definition])</td></tr>
-<tr><th>Bookmarks:</th><td>[$ts get bookmarks] @ "
-
-set flag 0
-foreach b [$ts bookmarks] {
-	if $flag { puts -nonewline ", " }
-	incr flag
-	puts -nonewline [clock format $b -format "%T"]
-}
-
-puts "</td></tr><tr><th>File</th><td>"
-
-puts "<div style=\"position: relative; top: -10px\">"
-
-proc div {type left right} {
-	set width $($right - $left)
-	puts "<div class=$type style=\"left: ${left}px; width: ${width}px\">
-	    $type</div>"
-}
-
-set keeping 0
-set last 0
-set start -1
-foreach b [$ts bookmarks] {
-	if {$start < 0} {
-		set start $b
-		continue
-	}
-	set end $b
-
-	incr keeping $($end - $start)
-
-	set left $($start * 500 / $len)
-	set right $($end * 500 / $len)
-
-	div cut $last $($left - 1)
-	div keep $left $($right - 1)
-
-	set last $right
-
-	set start -1
-}
-
-if {$start > 0} {
-	incr keeping $($len - $start)
-	set left $($start * 500 / $len)
-	div cut $last $($left - 1)
-	div keep $left 500
-} else {
-	div cut $last 500
-}
-
-set keepperc $($keeping * 100.0 / $len)
-set esttime $(int($keeping * 0.025))
-if {[$ts get definition] eq "HD"} { set esttime $($esttime * 4) }
-
-puts "
-</div>
-</td></tr>
-<tr><th>Keeping:</th><td>
-[clock format $keeping -format "%T"] ([format "%.2f" $keepperc]%)
-</td></tr>
-<tr><th>Time:</th>
-<td>Cropping will take around [clock format $esttime -format "%T"]</td></tr>
-</table>
-
-<span class=hidden id=params
-    file=\"[cgi_quote_url $rfile]\"
-    perc=\"$keepperc\"
-    dir=\"[cgi_quote_url $dir]\"
-></span>
-
-<div id=cropdiv style=\"padding: 1em\">
-<button id=cropit>Perform crop operation</button>
-</div>
-
-<div id=progressdiv class=hidden>
-Cropping: <div id=progressbar></div>
-</div>
-
-<button id=back class=hidden>Back to media list</button>
-
-<div id=output class=pre style=\"margin-top: 10px\"></div>
-</fieldset>
-
-"
-

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

@@ -1,38 +0,0 @@
-var handle = 0;
-
-function update()
-{
-	var perc = $('#params').attr('perc');
-	var file = $('#params').attr('file');
-
-	$.get('progress.jim' + '?perc=' + perc + '&file=' + file,
-	    function(data) {
-		if (handle)
-			$('#progressbar').reportprogress(data);
-	});
-}
-
-$(document).ready(function() {
-
-$('#progressbar').reportprogress(0);
-
-$('#back').button().click(function() {
-	window.location = '../index.jim?dir=' + $('#params').attr('dir');
-});
-
-$('#cropit').button().click(function() {
-	$('#cropdiv').hide('slow');
-	$('#progressdiv').show('slow');
-	handle = setInterval("update()", 1000);
-	$('#output').text('Please do not interrupt...')
-	    .load('execute.jim?file=' + $('#params').attr('file'),
-	    function() {
-		clearInterval(handle);
-		handle = 0;
-		$('#back').show();
-		$('#progressbar').reportprogress(100);
-	});
-});
-
-});
-

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

@@ -1,57 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-require ts.class pretty_size system.class
-
-httpheader
-
-set rfile [cgi_get file]
-
-if {[system inuse $rfile]} {
-	puts "This file is in use. Cannot process at the moment."
-	exit
-}
-
-set ts [ts fetch $rfile]
-set dir [file dirname $rfile]
-
-set len [$ts duration 1]
-
-set cropstart [clock milliseconds]
-
-set base [file rootname $rfile]
-set origdir "$dir/_original"
-if {![file exists $origdir]} { file mkdir $origdir }
-
-set shname [file tail $base]
-puts "Processing $shname"
-
-if {[file exists "$origdir/$shname.ts"]} {
-	puts "This recording already exists within _original"
-	puts "Cannot continue."
-	exit
-}
-
-puts "Moving recording to $origdir"
-foreach f [glob -nocomplain "${base}.*"] {
-	set tail [file tail $f]
-	puts "  $tail"
-	file rename $f "$origdir/$tail"
-}
-
-puts [exec /mod/bin/nicesplice \
-    -in "$origdir/$shname" \
-    -out "$dir/$shname" \
-    -cutBookMarks]
-
-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

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

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

@@ -1,67 +0,0 @@
-#!/mod/bin/jimsh
-
-package require sqlite3
-package require cgi
-source /mod/webif/lib/setup
-require ts.class
-
-header
-
-set rfile [cgi_get file]
-set ts [ts fetch $rfile]
-set dir [file dirname $rfile]
-set len [$ts duration 1]
-lassign [$ts dlnaloc "127.0.0.1"] url
-
-puts "
-<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
-<script type=text/javascript src=/js/jquery.progressbar.js></script>
-<script type=text/javascript src=decrypt.js></script>
-
-<fieldset class=cleft>
-<legend>Decrypt in-place</legend>
-
-<table class=keyval cellpadding=5>
-<tr><th>File:</th><td>$rfile</td></tr>
-<tr><th>Length:</th><td>[clock format $len -format "%T"]</td></tr>
-<tr><th>DLNA URL</th><td>$url</td></tr>
-</table>
-"
-
-if {$url eq ""} {
-	puts "This file has not been indexed by the media server.
-	    Cannot decrypt."
-	puts "Have you enabled <i>Content Sharing</i> in the Humax menus?"
-	exit
-}
-
-if {![system is_listening 9000]} {
-	puts "The Humax media server is not running, cannot decrypt."
-	puts "Have you enabled <i>Content Sharing</i> in the Humax menus?"
-	puts "It can sometimes turn itself off so it's worth double checking."
-	puts "If it is on then try turning sharing off and on again."
-	exit
-}
-
-puts "
-
-<span class=hidden id=params
-    dir=\"[cgi_quote_url $dir]\"
-    file=\"[cgi_quote_url $rfile]\"
-></span>
-
-<div id=decryptdiv style=\"padding: 1em\">
-<button id=decryptit>Perform decryption</button>
-</div>
-
-<div id=progressdiv class=hidden>
-Decrypting: <div id=progressbar></div>
-</div>
-
-<button id=back class=hidden>Back to media list</button>
-
-<div id=output class=pre style=\"margin-top: 10px\"></div>
-</fieldset>
-
-"
-

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

@@ -1,35 +0,0 @@
-
-var handle = 0;
-
-function update()
-{
-	$.get('progress.jim?file=' + $('#params').attr('file'),
-	    function(data) {
-		if (handle)
-			$('#progressbar').reportprogress(data);
-	});
-}
-
-$(document).ready(function() {
-
-$('#progressbar').reportprogress(0);
-
-$('#back').button().click(function() {
-	window.location = '../index.jim?dir=' + $('#params').attr('dir');
-});
-
-$('#decryptit').button().click(function() {
-	$('#decryptdiv').hide('slow');
-	$('#progressdiv').show('slow');
-	handle = setInterval("update()", 1000);
-	$('#output').load('execute.jim?file=' + $('#params').attr('file'),
-	    function() {
-		clearInterval(handle);
-		handle = 0;
-		$('#back').show();
-		$('#progressbar').reportprogress(100);
-	});
-});
-
-});
-

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

@@ -1,68 +0,0 @@
-#!/mod/bin/jimsh
-
-package require sqlite3
-package require cgi
-source /mod/webif/lib/setup
-require ts.class system.class
-
-httpheader
-
-set rfile [cgi_get file]
-set ts [ts fetch $rfile]
-set dir [file dirname $rfile]
-set len [$ts duration 1]
-lassign [$ts dlnaloc "127.0.0.1"] url
-
-if {$url eq ""} {
-	puts "This file has not been indexed by the media server.
-	    Cannot decrypt."
-	exit
-}
-
-if {[system inuse $rfile]} {
-	puts "This file is in use. Cannot decrypt at the moment."
-	exit
-}
-
-set xstart [clock milliseconds]
-
-set base [file rootname $rfile]
-set origdir "$dir/_original"
-if {![file exists $origdir]} { file mkdir $origdir }
-
-set shname [file tail $base]
-puts "Processing $shname"
-
-if {[file exists "$origdir/$shname.ts"]} {
-	puts "The file already exists in _original, cannot decrypt."
-	exit
-}
-
-exec wget -O "$rfile.decrypting" $url
-
-puts "Moving recording to $origdir"
-
-foreach f [glob -nocomplain "${base}.*"] {
-	if {[file extension $f] eq ".decrypting"} { continue }
-	set tail [file tail $f]
-	puts "  $tail"
-	file rename $f "${origdir}/$tail"
-}
-
-file rename "$rfile.decrypting" $rfile
-
-foreach ext {nts hmt thm} {
-	set sidecar "$shname.$ext"
-	if {[file exists "$origdir/$sidecar"]} {
-		puts "Copying back sidecar $ext"
-		file copy "$origdir/$sidecar" "$dir/$sidecar"
-	}
-}
-
-if {[file exists "$dir/$shname.hmt"]} {
-	exec /mod/bin/hmt -encrypted "$dir/$shname.hmt"
-}
-
-set xtime [expr [expr [clock milliseconds] - $xstart] / 1000.0]
-puts "Time taken: $xtime"
-

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

@@ -1,20 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-require ts.class
-
-httpheader
-
-set tsfile [cgi_get file]
-set rfile [file normalize $tsfile]
-
-if {![file exists "$rfile.decrypting"]} {
-	puts "0"
-} else {
-	set sz [file size $rfile]
-	set nsz [file size "$rfile.decrypting"]
-
-	puts [expr $nsz * 100 / $sz]
-}
-

var/mongoose/html/browse/delete.jim

@@ -1,35 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-require safe_delete ts.class
-
-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>"
-
-ts resetnew $dir
-

var/mongoose/html/browse/download.jim

@@ -1,43 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-package require sqlite3
-source /mod/webif/lib/setup
-require ts.class
-
-set file [cgi_get file]
-set urlbase [cgi_get base ""]
-
-# Default to just downloading the raw file.
-set url $file
-set mime "video/ts"
-
-if {[string match {*.ts} $file]} {
-	if {![catch {set ts [ts fetch $file]}]} {
-
-		# If it's encrypted on disk and the DLNA option is available,
-		# then use the server to perform decryption on the fly.
-		if {[$ts flag "ODEncrypted"] > 0} {
-			set dlna [$ts dlnaloc $urlbase]
-			if {[llength $dlna]} { lassign $dlna url mime }
-
-			#puts "DLNA: $dlna"
-		}
-	}
-}
-
-puts "Content-Type: text/plain"
-puts "Refresh: 0; url=$url"
-puts "Content-length: 0"
-puts ""
-
-#puts "Pragma: public"
-#puts "Expires: 0"
-#puts "Cache-Control: must-revalidate, post-check=0, pre-check=0"
-#puts "Content-Type: application/force-download"
-#puts "Content-Type: application/download"
-#puts "Content-Type: $mime"
-#puts "Content-Disposition: attachment; filename=\"[file tail $file]\""
-#puts "Content-Transfer-Encoding: binary"
-#puts "Content-Length: [file size $rfile]"
-

var/mongoose/html/browse/epgtitle.jim

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

var/mongoose/html/browse/file.jim

@@ -1,161 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-require pretty_size
-
-httpheader
-
-set file [cgi_get file]
-set type [cgi_get type]
-
-if {$file == 0} exit
-
-file stat $file st
-set sz [pretty_size $st(size)]
-
-if {$type eq "ts"} {
-	require epg.class ts.class
-
-	set ts [ts fetch $file]
-
-	puts "
-<table class=keyval>
-<tr>
-	<th>Title</th>
-	<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>
-</tr><tr>
-	"
-
-	if {[$ts flag "Guidance"] > 0} {
-		puts "
-			<th>Guidance</th>
-			<td><img class=va
-			    src=/images/174_1_26_GuidancePolicy.png height=21>
-			    [$ts get guidance]
-			</td>
-			</tr><tr>
-		"
-	}
-
-	puts "
-	<th>Definition</th>
-	<td>
-	"
-	if {[$ts get definition] eq "HD"} {
-		puts "<img class=va src=/images/172_1_00_HD.png height=21>"
-	} else {
-		puts "<img class=va src=/images/172_1_26_SD.png height=21>"
-	}
-	puts "</td>
-</tr><tr>
-	<th>Channel</th>
-	<td>[epg channelicon [$ts get channel_name] 50 "vertical-align: middle"]
-	    [$ts get channel_num] - [$ts get channel_name]</td>
-</tr><tr>
-	<th>Start Time</th>
-	<td>"
-	puts [clock format [$ts get start] -format "%c %Z"]
-	puts "<font class=also>(Scheduled: [
-	    clock format [$ts get schedstart] -format "%c %Z"])</font>"
-	puts "</td>
-</tr><tr>
-	<th>End Time</th>
-	<td>"
-	puts [clock format [$ts get end] -format "%c %Z"]
-	puts "<font class=also>(Scheduled: [clock format \
-	    [expr [$ts get schedstart] + [$ts get scheddur]] \
-	    -format "%c %Z"])</font>"
-	puts "</td>
-</tr><tr>
-	<th>Duration</th>
-	<td>[$ts duration] minute(s).
-	    <font class=also>(Scheduled: [expr [$ts get scheddur] / 60])
-	    </font></td>
-</tr><tr>
-	<th>Size</th>
-	<td>$sz</td>
-"
-lassign [$ts dlnaloc] url
-if {$url ne ""} {
-	puts "</tr><tr><th>DLNA&nbsp;URL</th>
-	   <td><a href=\"$url\">$url</a></td>"
-}
-puts "
-</tr><tr>
-	<th>Files</th>
-	<td>
-"
-
-set fileset [$ts fileset]
-puts -nonewline "<img id=xfileset class=va src=/img/tree/plusonly.png>"
-puts -nonewline "[llength $fileset] file"
-if {[llength $fileset] != 1} { puts -nonewline "s" }
-puts -nonewline " in set."
-puts "<div id=fileset class=hidden><ul>"
-foreach f $fileset {
-	puts "<li>[file tail $f] ([pretty_size [file size $f]])</li>" 
-}
-puts "</ul></div>"
-
-puts "</td>
-</tr><tr>
-	<th>Flags</th>
-	<td>[$ts get flags]
-"
-if {[$ts get bookmarks]} {
-		puts " \[Bookmarks: [$ts get bookmarks]\]"
-}
-
-	puts "</tr>"
-	puts "</table>"
-	puts {
-<script type=text/javascript>
-$('#xfileset').click(function() {
-	$('#fileset').slideToggle('slow', function() {
-		if ($('#fileset').is(':visible'))
-			$('#xfileset').attr('src', '/img/tree/minustop.png');
-		else
-			$('#xfileset').attr('src', '/img/tree/plusonly.png');
-	});
-});
-</script>
-	}
-	exit
-}
-
-# Otherwise, for a general file.
-
-puts "
-<table class=keyval>
-<tr>
-	<th>File</th>
-	<td>$file</td>
-</tr><tr>
-	<th>Size</th>
-	<td>$sz</td>
-</tr><tr>
-	<th>Info</th>
-	<td class=pre id=ffmpeg>
-		<img src=/img/loading.gif><i>Loading...</i>
-	</td>
-</tr>
-</table>
-"
-
-set url "/browse/ffmpeg.jim?file=[cgi_quote_url $file]"
-puts { <script type="text/javascript"> }
-puts "var url = \"$url\";"
-puts {
-	$('#ffmpeg').load(url);
-</script>
-}
-

var/mongoose/html/browse/flagdir.jim

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

var/mongoose/html/browse/iconset.jim

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

var/mongoose/html/browse/index.jim

@@ -1,407 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-require ts.class pretty_size system.class settings.class escape browse.class
-
-header
-
-set nicesplice [system pkginst nicesplice]
-set flatten [system pkginst flatten]
-
-set ignore {.nts .thm .hmi}
-set include {.ts .avi .mpg .mpeg .wmv .mkv .mp3 .mp4 .mov .hmt}
-
-if {![dict exists $env REQUEST_URI]} {
-	set env(REQUEST_URI) ""
-	cgi_input
-	set _cgi(dir) "/media/My Video/"
-}
-
-if {![dict exists $env QUERY_STRING]} { set env(QUERY_STRING) "root" }
-
-set config [settings new]
-
-set order [cgi_get order -]
-if {$order eq "-"} {
-	set order [$config sortorder]
-} else {
-	$config sortorder $order
-}
-
-set nofcount [$config nounwatchedcount]
-
-set model [system model]
-set dustbin [system dustbin 1]
-
-proc icon {img {hover ""} {extra ""} {class "va"}} {
-	puts -nonewline "<img src=$img class=\"$class\" height=21 $extra"
-	if {$hover ne ""} {
-		puts -nonewline " alt=\"$hover\" title=\"$hover\""
-	}
-	puts ">"
-}
-
-proc directory {file bfile tbfile} {
-	puts "<div class=\"va relative\">"
-	set img "/images/711_1_09_Media_Folder.png"
-	if {$bfile eq $::dustbin} { set img "/img/Dustbin_Folder.png" }
-	puts "<img border=0 class=va id=\"img$tbfile\" src=$img>"
-	if {!$::nofcount} { puts "<span class=foldernum></span>" }
-	puts "<input class=\"fs fsdir\" type=checkbox>"
-	puts "<a class=dbf
-	    href=\"$::env(REQUEST_URI)?dir=[cgi_quote_url $file]\"
-	    file=\"[cgi_quote_url $file]\">"
-	puts "$bfile</a><span class=filesize id=\"$tbfile\">
-		</span>"
-
-	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=\"$class va\" border=0 width=45 "
-	puts -nonewline [join $attrs " "]
-	puts "
-		    src=/images/181_1_00_Help5_OPT_Plus.png>
-	      </a>
-	"
-
-	puts "
-	    <div class=\"results blood\" style=\"margin: 0 0 0 5em\"></div>
-	"
-	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 [string tolower [file extension $file]]
-	if {$ext in $::ignore || $ext ni $::include} { return }
-
-	file stat $file st
-	set rsz $st(size)
-	set sz [pretty_size $rsz]
-
-	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.
-		set type bad
-		set ts 0
-		set img Video_Failed
-		set omenu oopt
-	} else {
-		set type gen
-		set ts 0
-		set img Video_Other
-		set omenu oopt
-	}
-	incr filecount
-
-	set new 0
-	if {$type eq "ts"} {
-		if {[$ts flag "New"] > 0} { set new 1 }
-	} elseif {$type eq "gen"} {
-		if {![file exists "${base}.hmi"]} { set new 1 }
-	}
-
-	if {$new} { append img _New }
-
-	set fscl "fs"
-	set synopsis ""
-	if {$type eq "ts"} {
-		set fscl "fs fsts"
-		set synopsis [cgi_quote_html [$ts get synopsis]]
-	}
-
-	puts "
-	    <div class=\"va bf\" id=[incr i]>
-		<img class=va border=0 src=/img/$img.png>
-		<input class=\"$fscl\" type=checkbox>
-		<a class=bf title=\"$synopsis\"
-		    file=\"[cgi_quote_url $file]\" type=$type href=#>
-		    $bfile
-	        </a>
-	"
-
-	# Size
-	puts "<span class=filesize> ($sz) </span>"
-
-	# Icons
-
-	set locked 0
-	set encd 0
-	set odencd 1
-	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 "" "va genre"
-		} else {
-			icon "/images/173_3_00_G3_$img.png" $txt "" "va genre"
-		}
-
-		# HD / SD
-		if {[$ts get definition] eq "HD"} {
-			set def HD
-			set img "172_1_00_HD"
-		} else {
-			set def SD
-			set img "172_1_26_SD"
-		}
-		icon "/images/$img.png"
-
-		# Locked
-		if {[$ts flag "Locked"] > 0} {
-			set locked 1
-			icon "/images/178_1_00_Icon_Lock.png" "Locked"
-		}
-
-		# Encrypted
-		if {[$ts flag "Encrypted"] > 0} {
-			set encd 1
-			icon "/images/749_1_26_Video_Encryption.png" ""
-		}
-		if {![$ts flag "ODEncrypted"]} {
-			set odencd 0
-			icon "/img/Decrypted.png" "Decrypted"
-		}
-
-		# Guidance
-		if {[$ts flag "Guidance"] > 0} {
-			icon "/images/174_1_26_GuidancePolicy.png"
-		}
-
-		# Indexed
-		if {$::model eq "HDR" && [llength [$ts dlnaloc]]} {
-			icon "/img/dlna.png" "Indexed by DLNA Server"
-			set dlna 1
-		}
-
-		# Shrunk
-		if {[$ts flag Shrunk]} {
-			icon "/img/compress.png" "Shrunk"
-			set shrunk 1
-		}
-
-		set bx [$ts get bookmarks]
-	}
-
-	# Opt+ button
-
-	puts "
-	      <a href=#>
-		<img class=\"$omenu va\" border=0 width=45 type=$type did=$i
-		    locked=$locked encd=$encd def=$def new=$new bx=$bx
-		    shrunk=$shrunk rsize=$rsz
-		    odencd=$odencd dlna=$dlna thmok=$thmok
-		    src=/images/181_1_00_Help5_OPT_Plus.png>
-	      </a>
-	    <div class=\"results blood\" style=\"margin: 0 0 0 5em\"></div>
-	"
-	puts "</div>"
-}
-
-set mroot [system mediaroot]
-set dir [cgi_get dir $mroot]
-
-######################################################################
-# Render web page
-
-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=script.js></script>
-	<link type=text/css rel=stylesheet href=style.css />
-}
-
-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;\">
-"
-
-# Breadcrumb path
-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 "<span class=filesize id=dirsize></span>"
-puts "</legend>"
-
-# Parent directory
-set parent [join [lrange [split $dir /] 0 end-1] /]
-if {$parent ne ""} {
-	puts "
-	    <div class=va>
-		<a href=\"$env(REQUEST_URI)?dir=[cgi_quote_url $parent]\">
-		<img border=0 src=/images/711_3_09_Media_Folder_UP.png class=va>
-			\[parent directory\]</a>
-	    </div>
-	"
-}
-
-proc s_time {a b} {
-	global dir
-
-	set a "$dir/$a"
-	set b "$dir/$b"
-
-	set ad [file isdirectory $a]
-	set bd [file isdirectory $b]
-
-	if {$ad && !$bd} { return -1 }
-	if {$bd && !$ad} { return 1 }
-	if {$ad && $bd} {
-		if {$a < $b} { return -1 }
-		if {$a > $b} { return 1 }
-		return 0
-	}
-
-	if {[catch {file stat $a l}]} { return 0}
-	set at $l(ctime)
-	if {[catch {file stat $b l}]} { return 0}
-	set bt $l(ctime)
-
-	if {$at < $bt} { return -1 }
-	if {$at > $bt} { return 1 }
-	return 0
-}
-
-set files [readdir -nocomplain $dir]
-switch $order {
-	1 {		set files [lsort -command s_time $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>
-&nbsp;&nbsp;
-Directories: $dircount, Files: $filecount
-"
-
-# Sort icons
-puts "<div id=sortdiv>"
-set sortlist {{0 sort_name name} {1 sort_date date}}
-foreach sl $sortlist {
-	lassign $sl index img descr
-
-	if {$index} { puts "  |  " }
-
-	set tag "Currently sorting"
-	if {$order != $index} {
-		puts "
-	    <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"
-	if {$order != $index} {
-		puts "</a>"
-	}
-}
-puts "</div>"
-
-puts "</fieldset>"
-
-puts {
-<fieldset class=left style="margin: 0 1em 1em 1em">
-<legend style="font-size: 1.5em; padding: 0 0.5em 0.5em 0.5em; color: #1e5bbd;">
-File Clipboard
-</legend>
-<div id=clipboard>
-<img src=/img/loading.gif> <i>Loading...</i>
-</div>
-</fieldset>
-}
-
-puts "<div class=brow>"
-
-puts {
-<button id=copy>Copy</button>
-<button id=cut>Cut</button>
-<button id=delete>Delete</button>
-<button id=newdir>New Folder</button>
-<div id=deletewait class=blood style="display: none">
-<img src=/img/loading.gif>Deleting may take some time, please be patient...
-</div>
-}
-
-# Join
-if $nicesplice {
-	puts { <button id=join>Join</button> }
-}
-
-puts "</div><div class=brow style=\"margin-top: 3px\">"
-
-# De-duplicate
-
-puts {
-	<button id=dedup>De-duplicate/tidy this folder</button>
-}
-
-# Streamer file
-
-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>
-	}
-}
-
-puts "</div>"
-
-footer
-

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

@@ -1,31 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-require ts.class pretty_size
-
-httpheader
-
-cgi_input 1
-
-set joinstart [clock milliseconds]
-
-set cmd {/mod/bin/nicesplice}
-set dst [file rootname [cgi_get dest "joined"]]
-
-foreach file [split [cgi_get files] ","] {
-	set file [cgi_unquote_input $file]
-	lappend cmd "-in" [file rootname $file]
-	set dir [file dirname $file]
-}
-lappend cmd "-out" "$dir/$dst"
-
-puts "($cmd)"
-puts [exec {*}$cmd]
-
-set ts [ts fetch "$dir/$dst.ts"]
-$ts settitle $dst
-
-set jointime [expr [expr [clock milliseconds] - $joinstart] / 1000.0]
-puts "Time taken: $jointime"
-

var/mongoose/html/browse/join/join.css

@@ -1,6 +0,0 @@
-#filelist { list-style-type: none; margin: 0; padding: 0; }
-#filelist li { margin: 0 3px 3px 3px; padding: 0.4em; padding-left: 1.5em;
-	height: 35px; }
-#filelist li span { position: absolute; margin-left: -1.3em; }
-span.pl { padding-left: 2em; }
-

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

@@ -1,64 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-require ts.class pretty_size
-
-header
-
-cgi_input 1
-#cgi_dump
-
-puts "
-<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
-<link href=join.css rel=stylesheet type=text/css />
-<script type=text/javascript src=/js/jquery.progressbar.js></script>
-<script type=text/javascript src=/js/touchbridge.js></script>
-<script type/text/javascript src=join.js></script>
-
-<p><b>
-Drag the files below into order, enter a name for the resulting file and then
-click the <i>Join</i> button.</b>
-"
-
-puts "<ul id=filelist>"
-set esize 0
-foreach file [split [cgi_get files] ","] {
-	set file [cgi_unquote_input $file]
-	set dir [file dirname $file]
-	set ts [ts fetch $file]
-	puts "<li class=\"va ui-state-default\" id=\"$file\"><span
-	    class=\"va ui-icon ui-icon-arrowthick-2-n-s\"></span>
-	    <img class=va src=/img/Video_TS.png>
-	    <span class=pl>
-	    $file ([clock format [$ts duration 1] -format "%T"])
-	    \[[pretty_size [$ts size]]\]
-	    <br><i style=\"font-size: 0.8em\">[$ts get title]</i>
-	    </span>
-	</li>"
-	incr esize [$ts size]
-}
-puts "</ul>"
-
-puts "
-<br><br>
-
-<div id=joindiv>
-Name for joined file:
-    <input id=dest name=dfile class=\"text ui-widget-content ui-corner-all\"
-    length=20 maxlength=50>
-<button id=dojoin>Join</button>
-</div>
-
-<div id=progressdiv style=\"display: none\">
-Joining: <div id=progressbar></div>
-<button id=back
-    dir=\"[cgi_quote_url $dir]\"
-    esize=\"$esize\"
-    style=\"display: none\">Back to media list</button>
-<div id=output class=pre style=\"margin-top: 10px\"></div>
-</div>
-"
-
-footer
-

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

@@ -1,62 +0,0 @@
-
-$('#filelist li').hover(
-    function() { $(this).css('cursor', 'pointer'); },
-    function() { $(this).css('cursor', 'auto'); }
-);
-
-var handle = 0;
-
-function update()
-{
-	$.get('progress.jim'
-	    + '?esize=' + $('#back').attr('esize')
-	    + '&file=' + $('#back').attr('dir') + '/' + $('#dest').val(),
-	    function(data) {
-		if (handle)
-			$('#progressbar').reportprogress(data);
-	});
-}
-
-$(document).ready(function() {
-
-$('#progressbar').reportprogress(0);
-
-$('#back').button().click(function() {
-	window.location = '../index.jim?dir=' + $(this).attr('dir');
-});
-
-$('#filelist').sortable().disableSelection();
-
-$('#dojoin').button().attr('disabled', true).addClass('ui-state-disabled')
-    .click(function() {
-	var files = $('#filelist').sortable('toArray');
-	var sfiles = new Array();
-	for (x in files)
-		sfiles.push(encodeURIComponent(files[x]));
-
-	$('#joindiv').hide('slow');
-	$('#progressdiv').show('slow');
-	handle = setInterval("update()", 1000);
-
-	$('#output').text('Please do not interrupt...')
-	    .load('execute.jim?files=' +
-	    sfiles.join() + '&dest=' + $('#dest').val(),
-	    function() {
-		clearInterval(handle);
-		handle = 0;
-		$('#back').show();
-		$('#progressbar').reportprogress(100);
-	});
-});
-
-$('#dest').val('').keyup(function() {
-	if ($(this).val().length > 0)
-		$('#dojoin')
-		    .removeProp('disabled').removeClass('ui-state-disabled');
-	else
-		$('#dojoin')
-		    .prop('disabled', true).addClass('ui-state-disabled');
-});
-
-});
-

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

@@ -1,20 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-
-httpheader
-
-set expected [cgi_get esize 1]
-set file [file normalize [cgi_get file]]
-
-if {![file exists $file]} {
-	puts "0"
-} else {
-	set sz [file size $file]
-
-	set perc [expr $sz * 100 / $expected]
-	if {$perc > 100} { set perc 100 }
-	puts $perc
-}
-

var/mongoose/html/browse/mknewdir.jim

@@ -1,12 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-
-httpheader
-
-set dir [cgi_get dir -]
-set name [cgi_get newdirname "New Folder"]
-
-file mkdir "$dir/$name"
-

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

@@ -1,28 +0,0 @@
-#!/mod/bin/jimsh
-
-package require sqlite3
-package require cgi
-source /mod/webif/lib/setup
-require ts.class system.class
-
-httpheader
-
-set rfile [cgi_get file]
-set ts [ts fetch $rfile]
-set dir [file dirname $rfile]
-set len [$ts duration 1]
-
-set xstart [clock milliseconds]
-
-set base [file rootname $rfile]
-set shname [file tail $base]
-puts "Processing $shname"
-
-puts [exec /mod/bin/ffmpeg -y -benchmark -v 0 \
-    -i $rfile \
-    -map 0:0 -map 0:1 \
-    -vcodec copy -acodec copy "${base}.mpg"]
-
-set xtime [expr [expr [clock milliseconds] - $xstart] / 1000.0]
-puts "Time taken: $xtime"
-

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

@@ -1,47 +0,0 @@
-#!/mod/bin/jimsh
-
-package require sqlite3
-package require cgi
-source /mod/webif/lib/setup
-require ts.class system.class
-
-header
-
-set rfile [cgi_get file]
-set ts [ts fetch $rfile]
-set dir [file dirname $rfile]
-set len [$ts duration 1]
-
-puts "
-<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
-<script type=text/javascript src=/js/jquery.progressbar.js></script>
-<script type=text/javascript src=mpg.js></script>
-
-<fieldset class=cleft>
-<legend>Extract to MPG</legend>
-
-<table class=keyval cellpadding=5>
-<tr><th>File:</th><td>$rfile</td></tr>
-<tr><th>Length:</th><td>[clock format $len -format "%T"]</td></tr>
-</table>
-
-<span class=hidden id=params
-    dir=\"[cgi_quote_url $dir]\"
-    rfile=\"[cgi_quote_url $rfile]\"
-></span>
-
-<div id=mpgdiv style=\"padding: 1em\">
-<button id=mpgit>Perform mpg extraction</button>
-</div>
-
-<div id=progressdiv class=hidden>
-Extracting mpg: <div id=progressbar></div>
-</div>
-
-<button id=back class=hidden>Back to media list</button>
-
-<div id=output class=pre style=\"margin-top: 10px\"></div>
-</fieldset>
-
-"
-

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

@@ -1,35 +0,0 @@
-
-var handle = 0;
-
-function update()
-{
-	$.get('progress.jim?file=' + $('#params').attr('rfile'),
-	    function(data) {
-		if (handle)
-			$('#progressbar').reportprogress(data);
-	});
-}
-
-$(document).ready(function() {
-
-$('#progressbar').reportprogress(0);
-
-$('#back').button().click(function() {
-	window.location = '../index.jim?dir=' + $('#params').attr('dir');
-});
-
-$('#mpgit').button().click(function() {
-	$('#mpgdiv').hide('slow');
-	$('#progressdiv').show('slow');
-	handle = setInterval("update()", 1000);
-	$('#output').load('execute.jim?file=' + $('#params').attr('rfile'),
-	    function() {
-		clearInterval(handle);
-		handle = 0;
-		$('#back').show();
-		$('#progressbar').reportprogress(100);
-	});
-});
-
-});
-

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

@@ -1,23 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-require ts.class
-
-httpheader
-
-set tsfile [cgi_get file]
-set rfile [file normalize $tsfile]
-set bfile [file rootname $rfile]
-
-if {![file exists "${bfile}.mpg"]} {
-	puts "0"
-} else {
-	set sz [file size $rfile]
-	set nsz [expr [file size "${bfile}.mpg"] / 0.75]
-
-	set perc [expr $nsz * 100 / $sz]
-	if {$perc > 100} { set perc 100 }
-	puts $perc
-}
-

var/mongoose/html/browse/rename.jim

@@ -1,48 +0,0 @@
-#!/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

@@ -1,12 +0,0 @@
-#!/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

@@ -1,18 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-require ts.class
-
-httpheader
-
-set dir [cgi_get dir "/media/My Video"]
-set file [file tail [cgi_get savestream_name]]
-set sfile [cgi_get savestream_source "/mnt/hd3/Streamer_down_file"]
-if {$file == "0"} { exit }
-if {[string length [string trim $file]] == 0} { exit }
-
-if {[file extension $file] ne ".mp4"} { append file ".mp4" }
-
-file copy $sfile "$dir/$file"
-

var/mongoose/html/browse/script.js

@@ -1,999 +0,0 @@
-
-var dir;
-
-function disableall()
-{
-	$('button,a,input').disable();
-}
-
-function pastedialogue()
-{
-	$('#pwdialogue').dialog({
-		title: "Pasting from clipboard",
-		modal: true, autoOpen: true,
-		height: 'auto', width: 'auto',
-		show: 'scale', hide: 'fade',
-		draggable: false, resizable: false,
-		closeOnEscape: false,
-		open: function() {
-		    $('.ui-dialog-titlebar-close').hide();
-		}
-	});
-}
-
-function reloadclipboard()
-{
-	$('#clipboard')
-	    .empty()
-	    .html('<img src=/img/loading.gif> <i>Loading...</i>')
-	    .load('/browse/clipboard.jim', function() {
-
-// Start Clipboard post-load actions
-
-if ($('#clipclear').length)
-{
-	$('#paste').enable();
-	$('#doptmenu,#dooptmenu').enableContextMenuItems('#paste');
-}
-else
-{
-	$('#paste').disable();
-	$('#doptmenu,#dooptmenu').disableContextMenuItems('#paste');
-}
-
-$('#clipclear').button().click(function() {
-	$.get('/browse/clipboard.jim?act=clear', function() {
-		reloadclipboard();
-	});
-});
-
-$('a.clipdel').click(function() {
-	$.get('/browse/clipboard.jim?act=remove&path=' +
-	    $(this).attr('path'), function() {
-		reloadclipboard();
-	});
-});
-
-$('#paste').button()
-    .click(function() {
-	disableall();
-	pastedialogue();
-	$('#pwfeedback').load(
-	    '/browse/clipboard.jim?act=paste&dir='
-	    + encodeURIComponent(dir), function() {
-		$('#pwdialogue').dialog('close');
-		window.location.reload(true);
-	});
-});
-
-
-// End Clipboard post-load actions
-
-	});
-}
-
-function epginfo_callback(data, status, xhr)
-{
-	//console.log(status);
-	//console.dir(data);
-
-	if (status != 'success')
-		return;
-
-	$('#rename_title').val(data.title);
-	$('#rename_synopsis').val(data.synopsis);
-	$('#rename_guidance').val(data.guidance);
-	$('#rename_genre').val(data.genre);
-
-	$('tr.tstype').show('slow');
-}
-
-function insert_folder_size(folder, size)
-{
-	folder = folder.replace(/ /g, '');
-	folder = folder.replace(/([ #;&,.+*~\':"!^$[\]()=>|\/@])/g, '\\$1');
-	//console.log("Folder: (%s) = (%s)", folder, size);
-	if (size.search(/\d$/) == -1)
-		size += 'iB';
-	else
-		size += ' bytes';
-	if (folder == "")
-		$('#dirsize').text(' (' + size + ')');
-	else
-		$('#' + folder).text(' (' + size + ')');
-}
-
-function folder_size_callback(data, status, xhr)
-{
-	//console.log("Status: %s", status);
-	//console.dir(data);
-	$.each(data, insert_folder_size);
-}
-
-function set_folder_new(folder, cnt)
-{
-	folder = folder.replace(/ /g, '');
-	folder = folder.replace(/([ #;&,.+*~\':"!^$[\]()=>|\/@])/g, '\\$1');
-	//console.log("Folder: (%s) = (%s)", folder, cnt);
-	left = cnt > 99 ? 11 : (cnt > 9 ? 14 : 17);
-	$('#img' + folder)
-	    .attr('src', '/img/Folder_New.png')
-	    .next('span.foldernum')
-	    .css('left', left + 'px')
-	    .text(cnt)
-	    .show();
-}
-
-function new_folder_callback(data, status, xhr)
-{
-	//console.log("Status: %s", status);
-	//console.dir(data);
-	$.each(data, set_folder_new);
-}
-
-//function insert_shrunk(file, perc)
-//{
-//	if (perc == 0)
-//	{
-//		file = file.replace(/[ ]/g, '');
-//		file = file.replace(/([ #;&,.+*~\':"!^$[\]()=>|\/@])/g, '\\$1');
-//		//console.log("File: (%s) = (%s)", file, perc);
-//		$('#sp_' + file).show();
-//	}
-//}
-
-//function shrunk_callback(data, status, xhr)
-//{
-//	//console.log("Status: %s", status);
-//	//console.dir(data);
-//	$.each(data, insert_shrunk);
-//}
-
-function delete_callback(file, dir, id)
-{
-	var el = 'div.bf#' + id;
-	var results = el + ' .results';
-	$(results)
-	    .html('<img src=/img/loading.gif>Deleting, please wait...')
-	    .slideDown('slow')
-	    .load('/browse/delete.jim', {
-		'dir': dir,
-		'files': [decodeURIComponent(file)]
-		}, function() {
-		$(el).delay(3000).slideUp(300, function() {
-			$(el).remove();
-		});
-	});
-}
-
-function lock_callback(file, type, id)
-{
-	var url = '/browse/lock.jim?file=' + file;
-	$.get(url, function() { window.location.reload(true); });
-}
-
-function enc_callback(file, type, id)
-{
-	var url = '/browse/enc.jim?file=' + file;
-	$.get(url, function() { window.location.reload(true); });
-}
-
-function new_callback(file, type, id)
-{
-	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();
-	$.post('/browse/rename.jim', s,
-	    function() { window.location.reload(true); });
-}
-
-function drename_submit()
-{
-	var s = $('#drenameform_form').serialize();
-	$.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('/browse/mknewdir.jim?' + s,
-	    function() { window.location.reload(true); });
-}
-
-function savestream_submit()
-{
-	var s = $('#savestream_form').serialize();
-	var sf = $('#save_stream').attr('file');
-	$('#savestream_name').disable();
-	$('#savestream_spin').show();
-	$.get('/browse/savestream.jim?sfile=' +
-	    encodeURIComponent(sf) + '&' + s,
-	    function() {
-		window.location.reload(true);
-	    });
-}
-
-var $confirm;	// Populated after DOM is loaded.
-
-function confirm_action(action, callback, file, type, id)
-{
-	var bfile = file.replace(/.*\/|\.[^.]*$/g, '');
-	$confirm.dialog('option', 'buttons', {
-		'Yes': function() { $(this).dialog('close');
-			callback(file, type, id); },
-		'No':  function() {$(this).dialog('close');}
-
-	});
-	$('#confirm').empty().html(
-	    'Are you sure you wish to ' + action + '<br>' +
-	    '<i>' + decodeURIComponent(bfile) + '</i> ?'
-	);
-	$confirm.dialog('open');
-}
-
-function preparemenu(el, menu)
-{
-	if (el.attr('type') == 'ts')
-	{
-//		if (el.attr('def') == 'HD')
-//		{
-//			$(menu).enableContextMenuItems('#enc');
-//			if (el.attr('encd') == 1)
-//				$(menu).changeContextMenuItem('#enc',
-//				    'Remove Enc');
-//			else
-//				$(menu).changeContextMenuItem('#enc',
-//				    'Set Enc');
-//		}
-
-		if (el.attr('bx') > 0)
-			$(menu).enableContextMenuItems('#crop');
-		else
-			$(menu).disableContextMenuItems('#crop');
-
-		if (el.attr('odencd') == 0)
-			$(menu).enableContextMenuItems('#thm');
-		else
-			$(menu).disableContextMenuItems('#thm');
-
-		if (el.attr('thmok') == 1)
-			$(menu).enableContextMenuItems('#vthm');
-		else
-			$(menu).disableContextMenuItems('#vthm');
-
-		$(menu).enableContextMenuItems('#strip');
-
-		if (el.attr('rsize') > 4294967296)
-			$(menu).enableContextMenuItems('#chunk');
-		else
-			$(menu).disableContextMenuItems('#chunk');
-
-		$(menu).enableContextMenuItems('#new');
-		if (el.attr('new') == 1)
-			$(menu).changeContextMenuItem('#new', 'Mark watched');
-		else
-			$(menu).changeContextMenuItem('#new', 'Mark new');
-
-
-		$(menu).enableContextMenuItems('#lock');
-		if (el.attr('locked') == 1)
-		{
-			$(menu).changeContextMenuItem('#lock', 'Unlock');
-			$(menu).disableContextMenuItems('#delete');
-		}
-		else
-		{
-			$(menu).changeContextMenuItem('#lock', 'Lock');
-			$(menu).enableContextMenuItems('#delete');
-		}
-
-		if (el.attr('odencd') == 1 && el.attr('dlna') == 1 &&
-		    el.attr('encd') == 0)
-			$(menu).enableContextMenuItems('#decrypt');
-		else
-			$(menu).disableContextMenuItems('#decrypt');
-
-		if (el.attr('odencd') == 1)
-		{
-			$(menu).disableContextMenuItems('#audio');
-			$(menu).disableContextMenuItems('#mpg');
-		}
-		else
-		{
-			$(menu).enableContextMenuItems('#audio');
-			if (el.attr('def') == 'HD')
-				$(menu).disableContextMenuItems('#mpg');
-			else
-				$(menu).enableContextMenuItems('#mpg');
-		}
-	}
-	else
-	{
-		$(menu).enableContextMenuItems('#delete');
-		$(menu).disableContextMenuItems('#lock');
-		//$(menu).disableContextMenuItems('#enc');
-		$(menu).disableContextMenuItems('#new');
-	}
-
-}
-
-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)
-	{
-		if (el.attr('noflat') > 0)
-			$(menu).changeContextMenuItem('#flat', 'Allow Flatten');
-		else
-			$(menu).changeContextMenuItem('#flat',
-			    'Prevent Flatten');
-	}
-
-	fixdmenu(el, menu, 'autoshrink', '#shrink', 'Auto-shrink', 1);
-	fixdmenu(el, menu, 'autodedup', '#dedup', 'Auto-dedup', 0);
-	fixdmenu(el, menu, 'autodecrypt', '#decrypt', 'Auto-decrypt', 1);
-	fixdmenu(el, menu, 'autompg', '#mpg', 'Auto-mpg', 0);
-	fixdmenu(el, menu, 'automp3', '#mp3', 'Auto-audio', 0);
-	fixdmenu(el, menu, 'autoexpire', '#expire', 'Auto-expire', 0);
-}
-
-$(document).ready(function() {
-
-dir = $('#dir').text();
-
-var menuclick = function(action, el, pos)
-{
-	var file = $(el).parent().prevAll('a.bf').last().attr('file');
-	var bfile = file.replace(/.*\/|\.[^.]*$/g, '');
-	bfile = bfile.replace(/[\x00-\x1f]+/g, '');
-	var type = $(el).attr('type');
-	var id = $(el).attr('did');
-	switch (action)
-	{
-	    case 'delete':
-		confirm_action('delete', delete_callback, file,
-		    dir, id);
-		break;
-
-	    case 'copy':
-		if (!confirm('Are you sure? Copying recordings takes a long time!'))
-			break;
-		// Fallthrough
-	    case 'cut':
-		$.get('/browse/clipboard.jim?act=add&mode=' + action +
-		    '&path=' + file, function() {
-			reloadclipboard();
-		    });
-		break;
-
-	    case 'lock':
-		confirm_action('change the lock on', lock_callback,
-		    file, type, id);
-		break;
-
-//	    case 'enc':
-//		confirm_action('change the ENC flag on', enc_callback,
-//		    file, type, id);
-//		break;
-
-	    case 'new':
-		confirm_action('change the New flag on', new_callback,
-		    file, type, id);
-		break;
-
-	    case 'rename':
-		$('#rename').val(decodeURIComponent(bfile));
-		$('#renamefile').val(decodeURIComponent(file));
-
-		$('#rename_title').val('');
-		$('#rename_synopsis').val('');
-		$('#rename_guidance').val('');
-		$('tr.tstype').css('display', 'none');
-
-		if (type == 'ts')
-		{
-			$.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 = '/browse/download.jim?file=' +
-		    file + '&base=' +
-		    encodeURIComponent(document.URL.match(/:\/\/(.[^/]+)/)[1]);
-		break;
-
-	    case 'crop':
-		window.location.href = '/browse/crop/crop.jim?file=' +
-		    file;
-		break;
-
-	    case 'strip':
-		window.location.href = '/browse/strip/strip.jim?file=' +
-		    file;
-		break;
-
-	    case 'chunk':
-		window.location.href = '/browse/chunk/chunk.jim?file=' +
-		    file;
-		break;
-
-	    case 'decrypt':
-		window.location.href =
-		    '/browse/decrypt/decrypt.jim?file=' + file;
-		break;
-
-	    case 'audio':
-		window.location.href = '/browse/audio/audio.jim?file=' +
-		    file;
-		break;
-
-	    case 'mpg':
-		window.location.href = '/browse/mpg/mpg.jim?file=' +
-		    file;
-		break;
-
-	    default:
-		alert('Unhandled action: ' + action);
-		break;
-	}
-};
-
-function flagdir(file, flag, iconset, output, options)
-{
-	var url = '/browse/flagdir.jim?dir=' + file +
-		    '&flag=' + flag;
-
-	$(output).load(url, function() {
-		$(iconset)
-		    .empty()
-		    .html('<img src=/img/loading.gif> Updating...')
-		    .load('/browse/iconset.jim?file=' + file);
-		if ($(options).attr(flag) == '1')
-			$(options).attr(flag, 0);
-		else
-			$(options).attr(flag, 1);
-	}).delay(3000).slideUp();
-}
-
-var dmenuclick = function(action, el, pos)
-{
-	var direl = $(el).parent().parent();
-	var file = $(el).parent().prevAll('a.dbf').last().attr('file');
-	var iconset = $(el).parent().prevAll('span.iconset').last();
-	var bfile = file.replace(/.*\//g, '');
-	bfile = bfile.replace(/[\x00-\x1f]+/g, '');
-	var results = $(el).parent().next('div.results');
-
-	switch (action)
-	{
-	    case 'paste':
-		pastedialogue();
-		$('#pwfeedback').load(
-		    '/browse/clipboard.jim?act=paste&dir=' +
-		    file, function() {
-			$('#pwdialogue').dialog('close');
-			reloadclipboard();
-		});
-		break;
-
-	    case 'delete':
-
-		if (confirm('Are you sure you wish to delete "' +
-		    decodeURIComponent(file) +
-		    '" and all files within it?'))
-		{
-			$(results)
-			    .html('<img src=/img/loading.gif>' +
-			    'Deleting, please wait...')
-			    .slideDown('slow')
-			    .load('/browse/delete.jim', {
-				'dir': dir,
-				'files': [decodeURIComponent(file)]
-				}, function() {
-				$(direl).delay(3000).slideUp(300, function() {
-					$(direl).remove();
-				});
-			});
-		}
-		break;
-
-	    case 'copy':
-		if (!confirm('Are you sure? Copying directories can take a very long time!'))
-			break;
-		// Fallthrough
-	    case 'cut':
-		$.get('/browse/clipboard.jim?act=add&mode=' + action +
-		    '&path=' + file, function() {
-			reloadclipboard();
-		    });
-		break;
-
-	    case 'rename':
-		$('#drename').val(decodeURIComponent(bfile));
-		$('#drenameorig').val(decodeURIComponent(file));
-		$('#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':
-		flagdir(file, 'noflatten', iconset, results, el);
-		break;
-
-	    case 'dedup':
-		flagdir(file, 'autodedup', iconset, results, el);
-		break;
-
-	    case 'mpg':
-		flagdir(file, 'autompg', iconset, results, el);
-		break;
-
-	    case 'mp3':
-		flagdir(file, 'automp3', iconset, results, el);
-		break;
-
-	    case 'shrink':
-		flagdir(file, 'autoshrink', iconset, results, el);
-		break;
-
-	    case 'shrinkr':
-		flagdir(file, 'autoshrinkr', iconset, results, el);
-		break;
-
-	    case 'decrypt':
-		flagdir(file, 'autodecrypt', iconset, results, el);
-		break;
-
-	    case 'decryptr':
-		flagdir(file, 'autodecryptr', iconset, results, el);
-		break;
-
-	    case 'resetnew':
-		var url = '/browse/resetnew.jim?dir=' + file;
-		$.get(url, function() { window.location.reload(true); });
-		break;
-
-	    default:
-		alert('Unhandled action: ' + action);
-		break;
-	}
-};
-
-	// Bind context menu to opt+ image
-	$('img.opt').contextMenu(
-		{
-			menu: 'optmenu',
-			leftButton: true,
-			beforeShow: preparemenu
-		},
-		menuclick
-	);
-
-	// Bind context menu to opt+ image
-	$('img.oopt').contextMenu(
-		{
-			menu: 'ooptmenu',
-			leftButton: true,
-			beforeShow: preparemenu
-		},
-		menuclick
-	);
-
-	$('img.dopt').contextMenu(
-		{
-			menu: 'doptmenu',
-			leftButton: true,
-			beforeShow: preparedmenu
-		},
-		dmenuclick
-	);
-
-	$('img.doopt').contextMenu(
-		{
-			menu: 'dooptmenu',
-			leftButton: true,
-			beforeShow: preparedmenu
-		},
-		dmenuclick
-	);
-
-	// Disable items which are not yet implemented.
-	$('#optmenu').disableContextMenuItems('#title');
-
-	var $buttons = {
-	    "Close" : function() {$(this).dialog('close');}
-	};
-	var $buttonsp = $.extend(
-	    {"Play" : function() { doplay(); }},
-	    $buttons);
-
-	// Create reusable dialogue.
-	var $dialog = $('#dialogue').dialog({
-		title: "Media Details",
-		modal: false, autoOpen: false,
-		height: 600, width: 700,
-		show: 'scale', hide: 'fade',
-		draggable: true, resizable: true,
-		buttons: $buttons,
-		close: function(e,u) { $('#dialogue').empty().html(
-		    '<img src="/img/loading.gif" alt="loading">'); }
-	});
-
-	function doplay()
-	{
-		var file = $dialog.attr('file');
-		var type = $dialog.attr('type');
-
-		disableall();
-
-		window.location = '/play/play.jim?' +
-		    'dir=' + encodeURIComponent(dir) +
-		    '&file=' + file;
-	}
-
-	// Bind dialogue open to filenames.
-	$('a.bf').click(function(e) {
-		e.preventDefault();
-
-		var file = $(this).attr('file');
-		var type = $(this).attr('type');
-		var opt = $(this).nextAll('a').find('img.opt');
-
-		var url = '/browse/file.jim?file=' + file
-		    + '&type=' + type;
-		$dialog.load(url);
-
-		$dialog.attr('file', file);
-		$dialog.attr('type', type);
-
-		if (type == 'ts' &&
-		    (opt.attr('odencd') == 0 || opt.attr('dlna') == 1))
-			$dialog.dialog("option", "buttons", $buttonsp);
-		else
-			$dialog.dialog("option", "buttons", $buttons);
-		$dialog.dialog('open');
-	});
-
-	$('#renameform').dialog({
-		autoOpen: false,
-		height: 'auto', width: 'auto',
-		modal: true,
-		buttons: {
-			"Update": rename_submit,
-			"Close": function() {
-				$(this).dialog('close');
-			}
-		},
-		close: function() { $('#rename').val(''); }
-	});
-
-	$('#drenameform').dialog({
-		autoOpen: false,
-		height: 'auto', width: 'auto',
-		modal: true,
-		buttons: {
-			"Update": drename_submit,
-			"Close": function() {
-				$(this).dialog('close');
-			}
-		},
-		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',
-		modal: true,
-		buttons: {
-			"Save": savestream_submit,
-			"Cancel": function() {
-				$(this).dialog('close');
-			}
-		},
-		close: function() { $('#savestream_name').val(''); }
-	});
-
-	$('#savestream_name').keyup(function(e) {
-		if (e.keyCode == $.ui.keyCode.ENTER)
-			savestream_submit();
-	});
-
-	$('#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,
-		height: 160, width: 500,
-		show: 'fade', hide: 'fade',
-		draggable: false, resizable: false
-	});
-
-	// Load folder sizes
-	$.getJSON('/browse/sizes.jim?dir=' + encodeURIComponent(dir),
-		folder_size_callback);
-
-	// Flag shrunk recordings
-//	$.getJSON('/browse/shrunk.jim?dir=' + encodeURIComponent(dir),
-//		shrunk_callback);
-
-	// Flag folders with unwatched items
-	$.getJSON('/browse/newdir.jim?dir=' + encodeURIComponent(dir),
-		new_folder_callback);
-
-	// Load clipboard
-	reloadclipboard();
-
-	// Uncheck everything
-	$('input.fs:checked').attr('checked', false);
-
-	// Buttons
-
-	$('#dedup').button().click(function() {
-		window.location = '/dedup/dedup.jim?dir='
-		    + encodeURIComponent(dir);
-	});
-
-	$('#save_stream').button().click(function() {
-		$('#savestream_retrieving').show();
-		$('#savestream_detail').text('').hide();
-		$('#savestream_spin').hide();
-		$('#savestream_name').val('').enable();
-
-		$('#savestreamform').dialog('open');
-		$('#savestream_detail').load(
-		    '/browse/ffmpeg.jim?file=' +
-		    encodeURIComponent($('#save_stream').attr('file')),
-		    function() {
-			$('#savestream_retrieving').hide();
-			$('#savestream_detail').show();
-			$('#savestream_form').show();
-		    });
-	});
-
-	$('#selectall').click(function(e) {
-		e.preventDefault();
-		$('input.fs').attr('checked', true).trigger('change');
-	});
-	$('#deselectall').click(function(e) {
-		e.preventDefault();
-		$('input.fs:checked').attr('checked', false).trigger('change');
-	});
-
-	$('#join').button().disable()
-	    .click(function() {
-		var files = new Array();
-		var els = $('input.fsts:checked + a').each(function() {
-			files.push($(this).attr('file'));
-		});
-		//console.log("%o", files);
-		window.location.href = '/browse/join/join.jim?files=' +
-		    files.join();
-	    });
-
-	$('#delete').button().disable()
-	    .click(function() {
-		var files = new Array();
-		var els = $('input.fs:checked + a').each(function() {
-			files.push(decodeURIComponent($(this).attr('file')));
-		});
-		//console.log("%o", files);
-		var str = 'Are you sure you want to delete ' + files.length +
-		    ' file';
-		if (files.length != 1) str += 's';
-		str += '?';
-		if (confirm(str))
-		{
-			disableall();
-			$('#deletewait').slideDown('slow');
-
-			$('#pwdialogue').dialog({
-				title: "Deleting",
-				modal: true, autoOpen: true,
-				height: 'auto', width: 'auto',
-				show: 'scale', hide: 'fade',
-				draggable: false, resizable: false,
-				closeOnEscape: false,
-				open: function() {
-				    $('.ui-dialog-titlebar-close').hide();
-				}
-			});
-			$('#pwfeedback').load(
-			    '/browse/delete.jim', {
-				'dir': dir,
-				'files': files
-				}, function() {
-				$('#pwdialogue').dialog('close');
-				window.location.reload(true);
-			});
-		}
-	    });
-
-	$('#copy,#cut').button().disable()
-	    .click(function() {
-		var files = new Array();
-		var els = $('input.fs:checked + a').each(function() {
-			files.push(decodeURIComponent($(this).attr('file')));
-		});
-		//console.log("%o", files);
-		var action = $(this).attr('id');
-		if (action == 'copy' && !confirm('Are you sure? ' +
-		    'Copying recordings can take a very long time!'))
-			return;
-
-		$.post('/browse/clipboard.jim', {
-		    'act': 'add',
-		    'dir': dir,
-		    'mode': action,
-		    'path': files
-		    }, function() {
-			reloadclipboard();
-			$('input.fs:checked').attr('checked', false);
-		    });
-	    });
-
-	$('#newdir').button().click(function() {
-		$('#newdirform').dialog({
-			autoOpen: true,
-			height: 'auto', width: 'auto',
-			modal: true,
-			buttons: {
-				"Create": newdir_submit,
-				"Cancel": function() {
-					$(this).dialog('close');
-				}
-			},
-			close: function() { $('#newdirname').val(''); }
-		});
-	});
-
-	$('input.fs').change(function() {
-		var num = $('input.fs:checked').size();
-		if (num > 0)
-			$('#delete,#cut,#copy').enable();
-		else
-			$('#delete,#cut,#copy').disable();
-
-		var num = $('input.fsts:checked').size();
-		if (num > 1)
-			$('#join').enable();
-		else
-			$('#join').disable();
-
-	});
-
-	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

@@ -1,34 +0,0 @@
-#!/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,40 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-
-httpheader "application/json"
-
-set dir [cgi_get dir]
-set dlen [string length "$dir/"]
-
-#9.4G	/media/My Video/Archive
-#1.4G	/media/My Video/CSI_ Crime Scene Investigation
-puts "{"
-foreach line [split [exec /mod/bin/busybox/du -h -d 1 "$dir/"] "\n"] {
-	lassign [split $line "\t"] size node
-	set node [string range $node $dlen end]
-	puts "\"$node\" : \"$size\","
-}
-
-# Handle symbolic links.
-foreach file [readdir $dir] {
-	set file "$dir/$file"
-	if {[catch {set lk [file readlink $file]}]} continue
-
-	if {![string match "/*" $lk]} { set lk "$dir/$lk" }
-
-	if {![file isdirectory $lk]} continue
-	foreach line [split [exec /mod/bin/busybox/du -h "$lk"] "\n"] {
-		set fields [split $line "\t"]
-		if {[lindex $fields 1] eq $lk} {
-			set node [file tail $file]
-			set size [lindex $fields 0]
-			puts "\"$node\" : \"@$size\","
-		}
-	}
-}
-
-puts "\"dummy\" : \"\""
-puts "}"
-

var/mongoose/html/browse/streamsize.jim

@@ -1,13 +0,0 @@
-#!/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

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

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

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

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

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

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

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

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

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