add automp3, fix ffmpeg

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

CONTROL/control

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

CONTROL/postinst

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+echo "Postinstall $*"
+
 export tmpf=/tmp/cronf.$$
 
 # Add cron jobs
@@ -27,5 +29,14 @@ $PKG_ROOT/etc/init.d/S02anacron start < /dev/null > /dev/null 2>&1 &
 
 [ -f /tmp/webif_auto.log ] && rm -f /tmp/webif_auto.log
 
+if [ ! -f /mod/webif/.strip-updated ]; then
+	echo "*********************************"
+	echo "* Please wait while any shrunk recordings are flagged..."
+	echo "*********************************"
+	/mod/webif/lib/bin/strip-update
+
+	touch /mod/webif/.strip-updated
+fi
+
 exit 0
 

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

@@ -7,11 +7,7 @@ require rsv.class
 
 set dir /mod/var/backup
 
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
+httpheader
 
 set now [clock seconds]
 set file [file tail [cgi_get file \

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

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

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

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

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

@@ -7,20 +7,14 @@ require rsv.class findhsvc system.class
 
 set dir /mod/var/backup
 
-puts "Content-Type: text/html"
-puts ""
+httpheader
 
-cgi_input
-#cgi_dump
-
-#set _cgi(restore_file) "backup-2011-Jul-09-20:37"
-
-if {![dict exists $_cgi restore_file]} {
+set file [file tail [cgi_get restore_file]]
+if {$file == 0} {
 	puts "No filename supplied."
 	exit
 }
 
-set file [file tail [dict get $_cgi restore_file]]
 set ffile "/$dir/$file.rbk"
 
 if {![file exists $ffile]} {

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

@@ -7,20 +7,14 @@ require rsv.class findhsvc
 
 set dir /mod/var/backup
 
-puts "Content-Type: text/html"
-puts ""
+httpheader
 
-cgi_input
-#cgi_dump
-
-#set _cgi(restore_file) "backup-2011-Jul-09-20:37"
-
-if {![dict exists $_cgi restore_file]} {
+set file [file tail [cgi_get restore_file]]
+if {$file == 0} {
 	puts "No filename supplied."
 	exit
 }
 
-set file [file tail [dict get $_cgi restore_file]]
 set ffile "/$dir/$file.rbk"
 
 if {![file exists $ffile]} {

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

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

var/mongoose/cgi-bin/channel.jim

@@ -5,13 +5,8 @@ package require sqlite3
 source /mod/webif/lib/setup
 require altrow progressbar epg.class
 
-puts "Content-Type: text/html"
-puts ""
-
 header
 
-cgi_input
-
 proc f2c {frequency} {
 	set ch int($((($frequency / 1000) - 303.25) / 8))
 	return [expr int($ch)]

var/mongoose/cgi-bin/db.jim

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

var/mongoose/cgi-bin/env.jim

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

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

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

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

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

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

@@ -4,22 +4,17 @@ package require cgi
 source /mod/webif/lib/setup
 require epg.class system.class
 
-puts "Content-Type: text/html"
-puts ""
+httpheader
 
-cgi_input
-#cgi_dump
+set service [cgi_get service -]
+set event [cgi_get event -]
+set type [cgi_get type 1]
 
-if {![dict exists $_cgi service] || ![dict exists $_cgi event]} {
+if {$service eq "-" || $event eq "-"} {
 	puts "Error, insufficient parameters passed."
 	exit
 }
 
-set service $_cgi(service)
-set event $_cgi(event)
-set type 1
-if {[dict exists $_cgi type]} { set type $_cgi(type) }
-
 set event [lindex [epg fetch dump -service $service -event $event] 0]
 if {$event eq ""} {
 	puts "Error, cannot find event to schedule."

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

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

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

@@ -4,9 +4,6 @@ package require cgi
 source /mod/webif/lib/setup
 require epg.class spinner.class altrow
 
-puts "Content-Type: text/html"
-puts ""
-
 header
 
 require totop
@@ -17,9 +14,6 @@ require totop
 	style "margin: 1em;"
 	}] start
 
-cgi_input
-#cgi_dump
-
 require epg_popup
 
 set service [cgi_get service 4351]

var/mongoose/cgi-bin/restart.jim

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

var/mongoose/cgi-bin/restartblock.jim

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

var/mongoose/cgi-bin/service.jim

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

var/mongoose/cgi-bin/settings.jim

@@ -4,11 +4,7 @@ package require cgi
 source /mod/webif/lib/setup
 require settings.class plugin system.class
 
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
+httpheader
 
 if {[cgi_get act] eq "https"} {
 	if {[cgi_get val off] eq "off"} {
@@ -43,6 +39,7 @@ set notoolbar [$settings notoolbar]
 set nomobile [$settings nomobile]
 set xepghours [$settings xepghours]
 if {$xepghours == 0} { set xepghours 4 }
+set genrededup [$settings genrededup]
 
 # Handle updates
 
@@ -82,6 +79,7 @@ handle_str_update epg_style $epg_style "EPG Type"
 handle_int_update pkgdev $pkgdev "Development Package Display"
 handle_int_update notoolbar $notoolbar "Disable toolbar"
 handle_int_update nomobile $nomobile "Disable mobile link"
+handle_int_update genrededup $genrededup "Genre search dedup"
 
 set acluser [cgi_get acluser "-"]
 set aclpass [cgi_get aclpass "-"]
@@ -179,6 +177,16 @@ puts ">
 	</tr>
 "
 
+puts "
+</table></fieldset>
+<br><br>
+<fieldset style=\"display: inline\">
+	<legend>
+		EPG Settings
+	</legend>
+<table>
+"
+
 puts "
 	<tr>
 	<form class=auto id=epg_style method=get action=$env(REQUEST_URI)>
@@ -260,6 +268,17 @@ puts "
 	</tr>
 "
 
+puts -nonewline "
+	<tr>
+		<th class=key>De-duplicate genre search results?</th>
+		<td><input id=genrededup_toggle name=genrededup type=checkbox value=yes"
+if {$genrededup == 1} { puts -nonewline " checked" }
+puts ">
+		    <div id=genrededup_output></div>
+		</td>
+	</tr>
+"
+
 puts "
 	</table>
 	</fieldset>

var/mongoose/cgi-bin/settings.js

@@ -137,5 +137,24 @@ $(document).ready(function () {
 				    .delay(2000).fadeOut('slow');
 		    });
 	});
+
+	$('#genrededup_toggle').change(function() {
+		var arg = '0';
+		if ($(this).attr('checked'))
+			arg = '1';
+
+		$(this).disable();
+
+		$('#genrededup_output')
+		    .empty()
+		    .show('slow')
+		    .load('/cgi-bin/settings.jim?genrededup=' + arg,
+		        function() {
+				$('#genrededup_toggle').enable();
+				$('#genrededup_output')
+				    .css('font-style', 'italic')
+				    .delay(2000).fadeOut('slow');
+		    });
+	});
 });
 

var/mongoose/cgi-bin/status.jim

@@ -10,12 +10,8 @@ if {[string match {*jim} $argv0]} { set runmode cgi }
 set schedtime 1200 
 case $runmode {
     cgi {
-	cgi_input
 	set type [cgi_get type "full"]
-	puts "Content-Type: text/html"
-	puts "Pragma: no-cache"
-	puts "Expires: Thu, 01 Jan 1970 00:00:00 GMT"
-	puts ""
+	httpheader
     }
     cli {
 	set type "full"
@@ -67,7 +63,10 @@ if {[llength $data]} {
 	foreach name [array names ndata] {
 		if {![dict exists $seen $name]} { set seen($name) 0 }
 		if {![dict exists $data $name]} { set data($name) 0 }
-		if {$ndata($name) == -1} {
+		if {[file exists "/mod/tmp/webif_auto/decrypting.$name.ts"]} {
+			set mode "Decrypting"
+			set icon "178_1_00_Icon_Lock.png style=\"padding: 0 0.2em 0 0.5em\""
+		} elseif {$ndata($name) == -1} {
 			incr rec
 			incr play
 			set mode "Chase Playing"

var/mongoose/cgi-bin/xepg.jim

@@ -3,14 +3,10 @@
 package require cgi
 source /mod/webif/lib/setup
 
-puts "Content-Type: text/html"
-puts ""
 header
 
 require epg.class spinner.class altrow epg_search totop
 
-cgi_input
-
 puts {
 <link type="text/css" href="/css/xepg.css" rel="Stylesheet" />
 <script type=text/javascript src=/js/enadis.js></script>

var/mongoose/html/browse/aexpiry.jim

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

var/mongoose/html/browse/assets.jim

@@ -21,8 +21,8 @@ if {$model eq "HDR"} {
 }
 if {[system pkginst ffmpeg]} {
 	puts {
-		<li><a href=#audio>Extract Audio</a></li>
-		<li><a href=#mpg>Extract to MPG</a></li>
+		<li class=mp3><a href=#audio>Extract Audio</a></li>
+		<li class=mpg><a href=#mpg>Extract to MPG</a></li>
 	}
 }
 if $nicesplice {
@@ -45,6 +45,14 @@ puts {
 	<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>
@@ -68,7 +76,17 @@ if $flatten {
 }
 
 puts {
-	<li class=mpg><a href=#mpg>Auto-MPG Extract</a></li>
+	<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">
@@ -166,7 +184,7 @@ puts {
 
 <div id=drenameform title="Rename directory" style="display: none">
 	<form id=drenameform_form>
-	<input type=hidden name="renameorig" id="drenameorig" value="">
+	<input type=hidden name="renamefile" id="drenameorig" value="">
 	<table border=0>
 	<tr>
 	<th>
@@ -232,6 +250,32 @@ puts {
 	</form>
 </div>
 
+<div id=aexpiry title="Auto-Expiry" style="display: none">
+	<form id=aexpiry_form>
+	<input type=hidden name="dir" id="aexpiry_ldir" value="">
+}
+puts {
+	<table border=0>
+	<tr>
+	<th>
+		<label for="aexpiry_days">
+			<b>Expire after</b>
+			<span class=blood>(in days)</span>
+		</label>
+	</th>
+	<td>
+		<input type=text name="aexpiry_days" id="aexpiry_days"
+		    type=number value=0 size=5 maxlength=3
+		    class="text ui-widget-content ui-corner-all">
+	</td>
+	</tr>
+	</table>
+	<div id=aexpiry_working class=hidden>
+		<img src=/img/loading.gif> Applying auto-expiry...
+	</div>
+	</form>
+</div>
+
 <div id=dialogue></div>
 <div id=confirm title="Confirmation Required"></div>
 <div id=pwdialogue style="display: none">

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

var/mongoose/html/browse/clipboard.jim

@@ -4,13 +4,9 @@ package require cgi
 source /mod/webif/lib/setup
 require clipboard.class ts.class
 
-puts "Content-Type: text/html; no-cache"
-puts "Expires: Thu, 01 Jan 1970 00:00:00 GMT"
-puts "Pragma: nocache"
-puts ""
+httpheader
 
 cgi_input 1
-#cgi_dump
 
 set cb [[clipboard new {path "/tmp/webif-browse.cb"}] load]
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

var/mongoose/html/browse/delete.jim

@@ -4,10 +4,7 @@ package require cgi
 source /mod/webif/lib/setup
 require safe_delete
 
-puts "Content-Type: text/html\r\n"
-
-cgi_input
-#cgi_dump
+httpheader
 
 set dir [cgi_get dir]
 

var/mongoose/html/browse/download.jim

@@ -5,11 +5,6 @@ package require sqlite3
 source /mod/webif/lib/setup
 require ts.class
 
-#puts "Content-Type: text/plain\r\n\r\n"
-
-cgi_input
-#cgi_dump
-
 set file [cgi_get file]
 set urlbase [cgi_get base ""]
 

var/mongoose/html/browse/enc.jim

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

var/mongoose/html/browse/epgtitle.jim

@@ -1,18 +1,13 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/ts.class
+source /mod/webif/lib/setup
+require ts.class
 
-puts "Content-Type: application/json"
-puts ""
+httpheader "application/json"
 
-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 file [cgi_get file]
+if {$file == 0} exit
 set ts [ts fetch $file]
 
 puts "{"

var/mongoose/html/browse/ffmpeg.jim

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

var/mongoose/html/browse/file.jim

@@ -4,18 +4,12 @@ package require cgi
 source /mod/webif/lib/setup
 require pretty_size
 
-puts "Content-Type: text/html"
-puts ""
+httpheader
 
-cgi_input
-#cgi_dump
+set file [cgi_get file]
+set type [cgi_get type]
 
-#set _cgi(file) "/media/My Video/Dangermouse/Series 1/01_rogue_robots.avi"
-
-if {![dict exists $_cgi file]} { exit }
-
-set file [dict get $_cgi file]
-set type [dict get $_cgi type]
+if {$file == 0} exit
 
 file stat $file st
 set sz [pretty_size $st(size)]
@@ -152,7 +146,7 @@ puts "
 </table>
 "
 
-set url "/cgi-bin/browse/ffmpeg.jim?file=[cgi_quote_url $file]"
+set url "/browse/ffmpeg.jim?file=[cgi_quote_url $file]"
 puts { <script type="text/javascript"> }
 puts "var url = \"$url\";"
 puts {

var/mongoose/html/browse/flagdir.jim

@@ -3,11 +3,7 @@
 package require cgi
 source /mod/webif/lib/setup
 
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
+httpheader
 
 set dir [cgi_get dir]
 set flag [cgi_get flag]

var/mongoose/html/browse/iconset.jim

@@ -4,8 +4,7 @@ package require cgi
 source /mod/webif/lib/setup
 require browse.class
 
-puts "Content-Type: text/html"
-puts ""
+httpheader
 
 set file [cgi_get file]
 

var/mongoose/html/browse/index.jim

@@ -4,8 +4,7 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class pretty_size system.class settings.class escape browse.class
 
-puts "Content-Type: text/html"
-puts ""
+header
 
 set nicesplice [system pkginst nicesplice]
 set flatten [system pkginst flatten]
@@ -13,11 +12,9 @@ set flatten [system pkginst flatten]
 set ignore {.nts .thm .hmi}
 set include {.ts .avi .mpg .mpeg .wmv .mkv .mp3 .mp4 .mov .hmt}
 
-cgi_input
-#cgi_dump
-
 if {![dict exists $env REQUEST_URI]} {
 	set env(REQUEST_URI) ""
+	cgi_input
 	set _cgi(dir) "/media/My Video/"
 }
 
@@ -59,9 +56,15 @@ proc directory {file bfile tbfile} {
 	puts [join $icons ""]
 	puts "</span>"
 
+	if {[string first $::mroot $file] >= 0} {
+		set class dopt
+	} else {
+		set class doopt
+	}
+
 	puts -nonewline "
 	      <a href=#>
-		<img class=\"dopt va\" border=0 width=45 "
+		<img class=\"$class va\" border=0 width=45 "
 	puts -nonewline [join $attrs " "]
 	puts "
 		    src=/images/181_1_00_Help5_OPT_Plus.png>
@@ -149,6 +152,7 @@ proc entry {file} {{i 0}} {
 	set def unknown
 	set bx 0
 	set dlna 0
+	set shrunk 0
 	if {$type eq "ts"} {
 		set genre [$ts get genre]
 		set glist [ts genrelist]
@@ -201,12 +205,11 @@ proc entry {file} {{i 0}} {
 			set dlna 1
 		}
 
-		# Shrunk (shown when necessary via Ajax)
-		icon "/img/compress.png" "Shrunk" \
-		    "id=\"sp_$tbfile\"" "va hidden"
-		# Timeshifted (shown when necessary via Ajax)
-		icon "/img/clock.png" "Time-shifted Recording" \
-		    "id=\"tsr_$tbfile\"" "va hidden"
+		# Shrunk
+		if {[$ts flag Shrunk]} {
+			icon "/img/compress.png" "Shrunk"
+			set shrunk 1
+		}
 
 		set bx [$ts get bookmarks]
 	}
@@ -217,7 +220,7 @@ proc entry {file} {{i 0}} {
 	      <a href=#>
 		<img class=\"$omenu va\" border=0 width=45 type=$type did=$i
 		    locked=$locked encd=$encd def=$def new=$new bx=$bx
-		    rsize=$rsz
+		    shrunk=$shrunk rsize=$rsz
 		    odencd=$odencd dlna=$dlna
 		    src=/images/181_1_00_Help5_OPT_Plus.png>
 	      </a>
@@ -226,27 +229,27 @@ proc entry {file} {{i 0}} {
 	puts "</div>"
 }
 
-set dir [cgi_get dir [system mediaroot]]
+set mroot [system mediaroot]
+set dir [cgi_get dir $mroot]
 
 ######################################################################
 # Render web page
 
-header
-
 puts { 
 	<link href=/css/jquery.contextMenu.css rel=stylesheet type=text/css />
 	<script type=text/javascript src=/js/jquery.contextMenu.js></script>
 	<link href=/css/jquery.bar.css rel=stylesheet type=text/css />
 	<script type=text/javascript src=/js/jquery.bar.js></script>
 	<script type=text/javascript src=/js/enadis.js></script>
-	<script type=text/javascript src=/cgi-bin/browse/browse.js></script>
-	<link type=text/css rel=stylesheet href=/cgi-bin/browse/style.css />
+	<script type=text/javascript src=script.js></script>
+	<link type=text/css rel=stylesheet href=style.css />
 }
 
-source browse/assets.jim
+source assets.jim
 
 puts "
 	<span style=\"display:none\" id=dir>$dir</span>
+	<span style=\"display:none\" id=mediaroot>$mroot</span>
       <fieldset class=cleft style=\"margin: 0 1em 1em 1em\">
       <legend style=\"font-size: 1.5em; padding: 0 0.5em 0.5em 0.5em;\">
 "

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

@@ -4,10 +4,9 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class pretty_size
 
-puts "Content-Type: text/html\r\n\r\n"
+httpheader
 
 cgi_input 1
-#cgi_dump
 
 set joinstart [clock milliseconds]
 

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

@@ -4,7 +4,6 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class pretty_size
 
-puts "Content-Type: text/html\r\n\r\n"
 header
 
 cgi_input 1

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

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

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

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

var/mongoose/html/browse/lock.jim

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

var/mongoose/html/browse/mknewdir.jim

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

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

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

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

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

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

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

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

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

var/mongoose/html/browse/new.jim

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

var/mongoose/html/browse/newdir.jim

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

var/mongoose/html/browse/rename.jim

@@ -4,11 +4,7 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class
 
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
+httpheader
 
 set file [cgi_get renamefile "-"]
 if {$file eq "-"} exit
@@ -29,8 +25,11 @@ if {[file isdirectory $file]} {
 		if {[catch {
 			set new [string trim [cgi_get "rename_$attr"]]
 			set old [$ts get $attr]
-			if {[string length $new] > 0 && $new ne $old} {
-				$ts set$attr $new
+			if {$new ne $old} {
+				if {$attr eq "guidance" ||
+				    [string length $new] > 0} {
+					$ts set$attr $new
+				}
 			}
 		} msg]} {
 			puts "$attr: $msg"

var/mongoose/html/browse/resetnew.jim

@@ -5,11 +5,7 @@ package require pack
 source /mod/webif/lib/setup
 require ts.class hexdump
 
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
+httpheader
 
 set dir [cgi_get dir]
 if {![file isdirectory $dir]} { exit }

var/mongoose/html/browse/savestream.jim

@@ -4,11 +4,7 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class
 
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
+httpheader
 
 set dir [cgi_get dir "/media/My Video"]
 set file [file tail [cgi_get savestream_name]]

var/mongoose/html/browse/script.js

@@ -26,29 +26,29 @@ function reloadclipboard()
 	$('#clipboard')
 	    .empty()
 	    .html('<img src=/img/loading.gif> <i>Loading...</i>')
-	    .load('/cgi-bin/browse/clipboard.jim', function() {
+	    .load('/browse/clipboard.jim', function() {
 
 // Start Clipboard post-load actions
 
 if ($('#clipclear').length)
 {
 	$('#paste').enable();
-	$('#doptmenu').enableContextMenuItems('#paste');
+	$('#doptmenu,#dooptmenu').enableContextMenuItems('#paste');
 }
 else
 {
 	$('#paste').disable();
-	$('#doptmenu').disableContextMenuItems('#paste');
+	$('#doptmenu,#dooptmenu').disableContextMenuItems('#paste');
 }
 
 $('#clipclear').button().click(function() {
-	$.get('/cgi-bin/browse/clipboard.jim?act=clear', function() {
+	$.get('/browse/clipboard.jim?act=clear', function() {
 		reloadclipboard();
 	});
 });
 
 $('a.clipdel').click(function() {
-	$.get('/cgi-bin/browse/clipboard.jim?act=remove&path=' +
+	$.get('/browse/clipboard.jim?act=remove&path=' +
 	    $(this).attr('path'), function() {
 		reloadclipboard();
 	});
@@ -59,7 +59,7 @@ $('#paste').button()
 	disableall();
 	pastedialogue();
 	$('#pwfeedback').load(
-	    '/cgi-bin/browse/clipboard.jim?act=paste&dir='
+	    '/browse/clipboard.jim?act=paste&dir='
 	    + encodeURIComponent(dir), function() {
 		$('#pwdialogue').dialog('close');
 		window.location.reload(true);
@@ -125,23 +125,23 @@ function new_folder_callback(data, status, xhr)
 	$.each(data, set_folder_new);
 }
 
-function insert_shrunk(file, perc)
-{
-	if (perc == 0)
-	{
-		file = file.replace(/[ ]/g, '');
-		file = file.replace(/([ #;&,.+*~\':"!^$[\]()=>|\/@])/g, '\\$1');
-		//console.log("File: (%s) = (%s)", file, perc);
-		$('#sp_' + file).show();
-	}
-}
+//function insert_shrunk(file, perc)
+//{
+//	if (perc == 0)
+//	{
+//		file = file.replace(/[ ]/g, '');
+//		file = file.replace(/([ #;&,.+*~\':"!^$[\]()=>|\/@])/g, '\\$1');
+//		//console.log("File: (%s) = (%s)", file, perc);
+//		$('#sp_' + file).show();
+//	}
+//}
 
-function shrunk_callback(data, status, xhr)
-{
-	//console.log("Status: %s", status);
-	//console.dir(data);
-	$.each(data, insert_shrunk);
-}
+//function shrunk_callback(data, status, xhr)
+//{
+//	//console.log("Status: %s", status);
+//	//console.dir(data);
+//	$.each(data, insert_shrunk);
+//}
 
 function delete_callback(file, dir, id)
 {
@@ -150,7 +150,7 @@ function delete_callback(file, dir, id)
 	$(results)
 	    .html('<img src=/img/loading.gif>Deleting, please wait...')
 	    .slideDown('slow')
-	    .load('/cgi-bin/browse/delete.jim', {
+	    .load('/browse/delete.jim', {
 		'dir': dir,
 		'files': [decodeURIComponent(file)]
 		}, function() {
@@ -162,40 +162,48 @@ function delete_callback(file, dir, id)
 
 function lock_callback(file, type, id)
 {
-	var url = '/cgi-bin/browse/lock.jim?file=' + file;
+	var url = '/browse/lock.jim?file=' + file;
 	$.get(url, function() { window.location.reload(true); });
 }
 
 function enc_callback(file, type, id)
 {
-	var url = '/cgi-bin/browse/enc.jim?file=' + file;
+	var url = '/browse/enc.jim?file=' + file;
 	$.get(url, function() { window.location.reload(true); });
 }
 
 function new_callback(file, type, id)
 {
-	var url = '/cgi-bin/browse/new.jim?file=' + file;
+	var url = '/browse/new.jim?file=' + file;
 	$.get(url, function() { window.location.reload(true); });
 }
 
 function rename_submit()
 {
 	var s = $('#renameform_form').serialize();
-	$.post('/cgi-bin/browse/rename.jim', s,
+	$.post('/browse/rename.jim', s,
 	    function() { window.location.reload(true); });
 }
 
 function drename_submit()
 {
 	var s = $('#drenameform_form').serialize();
-	$.get('/cgi-bin/browse/rename.jim?' + s,
+	$.get('/browse/rename.jim?' + s,
+	    function() { window.location.reload(true); });
+}
+
+function aexpiry_submit()
+{
+	$('#aexpiry_working').slideDown('slow');
+	var s = $('#aexpiry_form').serialize();
+	$.get('/browse/aexpiry.jim?' + s,
 	    function() { window.location.reload(true); });
 }
 
 function newdir_submit()
 {
 	var s = $('#newdirform_form').serialize();
-	$.get('/cgi-bin/browse/mknewdir.jim?' + s,
+	$.get('/browse/mknewdir.jim?' + s,
 	    function() { window.location.reload(true); });
 }
 
@@ -204,7 +212,7 @@ function savestream_submit()
 	var s = $('#savestream_form').serialize();
 	var sf = $('#save_stream').attr('file');
 	$('#savestream_spin').show();
-	$.get('/cgi-bin/browse/savestream.jim?sfile=' +
+	$.get('/browse/savestream.jim?sfile=' +
 	    encodeURIComponent(sf) + '&' + s,
 	    function() {
 		window.location.reload(true);
@@ -249,12 +257,7 @@ function preparemenu(el, menu)
 		else
 			$(menu).disableContextMenuItems('#crop');
 
-/*
-		if (el.attr('def') == 'HD')
-			$(menu).disableContextMenuItems('#strip');
-		else
-*/
-			$(menu).enableContextMenuItems('#strip');
+		$(menu).enableContextMenuItems('#strip');
 
 		if (el.attr('rsize') > 4294967296)
 			$(menu).enableContextMenuItems('#chunk');
@@ -355,6 +358,8 @@ function preparedmenu(el, menu)
 	fixdmenu(el, menu, 'autodedup', '#dedup', 'Auto-dedup', 0);
 	fixdmenu(el, menu, 'autodecrypt', '#decrypt', 'Auto-decrypt', 1);
 	fixdmenu(el, menu, 'autompg', '#mpg', 'Auto-mpg', 0);
+	fixdmenu(el, menu, 'automp3', '#mp3', 'Auto-audio', 0);
+	fixdmenu(el, menu, 'autoexpire', '#expire', 'Auto-expire', 0);
 }
 
 $(document).ready(function() {
@@ -380,7 +385,7 @@ var menuclick = function(action, el, pos)
 			break;
 		// Fallthrough
 	    case 'cut':
-		$.get('/cgi-bin/browse/clipboard.jim?act=add&mode=' + action +
+		$.get('/browse/clipboard.jim?act=add&mode=' + action +
 		    '&path=' + file, function() {
 			reloadclipboard();
 		    });
@@ -412,7 +417,7 @@ var menuclick = function(action, el, pos)
 
 		if (type == 'ts')
 		{
-			$.getJSON('/cgi-bin/browse/epgtitle.jim?file=' +
+			$.getJSON('/browse/epgtitle.jim?file=' +
 			    file, epginfo_callback);
 		}
 
@@ -420,38 +425,38 @@ var menuclick = function(action, el, pos)
 		break;
 
 	    case 'download':
-		window.location.href = '/cgi-bin/browse/download.jim?file=' +
+		window.location.href = '/browse/download.jim?file=' +
 		    file + '&base=' +
 		    encodeURIComponent(document.URL.match(/:\/\/(.[^/]+)/)[1]);
 		break;
 
 	    case 'crop':
-		window.location.href = '/cgi-bin/browse/crop/crop.jim?file=' +
+		window.location.href = '/browse/crop/crop.jim?file=' +
 		    file;
 		break;
 
 	    case 'strip':
-		window.location.href = '/cgi-bin/browse/strip/strip.jim?file=' +
+		window.location.href = '/browse/strip/strip.jim?file=' +
 		    file;
 		break;
 
 	    case 'chunk':
-		window.location.href = '/cgi-bin/browse/chunk/chunk.jim?file=' +
+		window.location.href = '/browse/chunk/chunk.jim?file=' +
 		    file;
 		break;
 
 	    case 'decrypt':
 		window.location.href =
-		    '/cgi-bin/browse/decrypt/decrypt.jim?file=' + file;
+		    '/browse/decrypt/decrypt.jim?file=' + file;
 		break;
 
 	    case 'audio':
-		window.location.href = '/cgi-bin/browse/audio/audio.jim?file=' +
+		window.location.href = '/browse/audio/audio.jim?file=' +
 		    file;
 		break;
 
 	    case 'mpg':
-		window.location.href = '/cgi-bin/browse/mpg/mpg.jim?file=' +
+		window.location.href = '/browse/mpg/mpg.jim?file=' +
 		    file;
 		break;
 
@@ -463,14 +468,14 @@ var menuclick = function(action, el, pos)
 
 function flagdir(file, flag, iconset, output, options)
 {
-	var url = '/cgi-bin/browse/flagdir.jim?dir=' + file +
+	var url = '/browse/flagdir.jim?dir=' + file +
 		    '&flag=' + flag;
 
 	$(output).load(url, function() {
 		$(iconset)
 		    .empty()
 		    .html('<img src=/img/loading.gif> Updating...')
-		    .load('/cgi-bin/browse/iconset.jim?file=' + file);
+		    .load('/browse/iconset.jim?file=' + file);
 		if ($(options).attr(flag) == '1')
 			$(options).attr(flag, 0);
 		else
@@ -492,7 +497,7 @@ var dmenuclick = function(action, el, pos)
 	    case 'paste':
 		pastedialogue();
 		$('#pwfeedback').load(
-		    '/cgi-bin/browse/clipboard.jim?act=paste&dir=' +
+		    '/browse/clipboard.jim?act=paste&dir=' +
 		    file, function() {
 			$('#pwdialogue').dialog('close');
 			reloadclipboard();
@@ -509,7 +514,7 @@ var dmenuclick = function(action, el, pos)
 			    .html('<img src=/img/loading.gif>' +
 			    'Deleting, please wait...')
 			    .slideDown('slow')
-			    .load('/cgi-bin/browse/delete.jim', {
+			    .load('/browse/delete.jim', {
 				'dir': dir,
 				'files': [decodeURIComponent(file)]
 				}, function() {
@@ -525,7 +530,7 @@ var dmenuclick = function(action, el, pos)
 			break;
 		// Fallthrough
 	    case 'cut':
-		$.get('/cgi-bin/browse/clipboard.jim?act=add&mode=' + action +
+		$.get('/browse/clipboard.jim?act=add&mode=' + action +
 		    '&path=' + file, function() {
 			reloadclipboard();
 		    });
@@ -537,6 +542,22 @@ var dmenuclick = function(action, el, pos)
 		$('#drenameform').dialog('open');
 		break;
 
+	    case 'expire':
+		if ($(el).attr('autoexpire') == 1)
+			flagdir(file, 'autoexpire', iconset, results, el);
+		else
+		{
+			$('#aexpiry_ldir').val(decodeURIComponent(file));
+			if ($(el).attr('autoexpiredays') > 0)
+				$('#aexpiry_days')
+				     .val($(el).attr('autoexpiredays'));
+			else
+				$('#aexpiry_days').val(7);
+			$('#aexpiry_working').hide('fast');
+			$('#aexpiry').dialog('open');
+		}
+		break;
+
 	    case 'flat':
 		flagdir(file, 'noflatten', iconset, results, el);
 		break;
@@ -549,6 +570,10 @@ var dmenuclick = function(action, el, pos)
 		flagdir(file, 'autompg', iconset, results, el);
 		break;
 
+	    case 'mp3':
+		flagdir(file, 'automp3', iconset, results, el);
+		break;
+
 	    case 'shrink':
 		flagdir(file, 'autoshrink', iconset, results, el);
 		break;
@@ -566,7 +591,7 @@ var dmenuclick = function(action, el, pos)
 		break;
 
 	    case 'resetnew':
-		var url = '/cgi-bin/browse/resetnew.jim?dir=' + file;
+		var url = '/browse/resetnew.jim?dir=' + file;
 		$.get(url, function() { window.location.reload(true); });
 		break;
 
@@ -605,6 +630,15 @@ var dmenuclick = function(action, el, pos)
 		dmenuclick
 	);
 
+	$('img.doopt').contextMenu(
+		{
+			menu: 'dooptmenu',
+			leftButton: true,
+			beforeShow: preparedmenu
+		},
+		dmenuclick
+	);
+
 	// Disable items which are not yet implemented.
 	$('#optmenu').disableContextMenuItems('#title');
 
@@ -647,7 +681,7 @@ var dmenuclick = function(action, el, pos)
 		var type = $(this).attr('type');
 		var opt = $(this).nextAll('a').find('img.opt');
 
-		var url = '/cgi-bin/browse/file.jim?file=' + file
+		var url = '/browse/file.jim?file=' + file
 		    + '&type=' + type;
 		$dialog.load(url);
 
@@ -688,6 +722,19 @@ var dmenuclick = function(action, el, pos)
 		close: function() { $('#drename').val(''); }
 	});
 
+	$('#aexpiry').dialog({
+		autoOpen: false,
+		height: 'auto', width: 'auto',
+		modal: true,
+		buttons: {
+			"Update": aexpiry_submit,
+			"Close": function() {
+				$(this).dialog('close');
+			}
+		},
+		close: function() { $('#aexpiry_days').val('0'); }
+	});
+
 	$('#savestreamform').dialog({
 		autoOpen: false,
 		height: 'auto', width: 'auto',
@@ -710,15 +757,15 @@ var dmenuclick = function(action, el, pos)
 	});
 
 	// Load folder sizes
-	$.getJSON('/cgi-bin/browse/sizes.jim?dir=' + encodeURIComponent(dir),
+	$.getJSON('/browse/sizes.jim?dir=' + encodeURIComponent(dir),
 		folder_size_callback);
 
 	// Flag shrunk recordings
-	$.getJSON('/cgi-bin/browse/shrunk.jim?dir=' + encodeURIComponent(dir),
-		shrunk_callback);
+//	$.getJSON('/browse/shrunk.jim?dir=' + encodeURIComponent(dir),
+//		shrunk_callback);
 
 	// Flag folders with unwatched items
-	$.getJSON('/cgi-bin/browse/newdir.jim?dir=' + encodeURIComponent(dir),
+	$.getJSON('/browse/newdir.jim?dir=' + encodeURIComponent(dir),
 		new_folder_callback);
 
 	// Load clipboard
@@ -738,7 +785,7 @@ var dmenuclick = function(action, el, pos)
 		$('#savestream_spin').hide();
 		$('#savestreamform').dialog('open');
 		$('#savestream_detail').load(
-		    '/cgi-bin/browse/ffmpeg.jim?file=' +
+		    '/browse/ffmpeg.jim?file=' +
 		    encodeURIComponent($('#save_stream').attr('file')));
 	});
 
@@ -758,7 +805,7 @@ var dmenuclick = function(action, el, pos)
 			files.push($(this).attr('file'));
 		});
 		//console.log("%o", files);
-		window.location.href = '/cgi-bin/browse/join/join.jim?files=' +
+		window.location.href = '/browse/join/join.jim?files=' +
 		    files.join();
 	    });
 
@@ -790,7 +837,7 @@ var dmenuclick = function(action, el, pos)
 				}
 			});
 			$('#pwfeedback').load(
-			    '/cgi-bin/browse/delete.jim', {
+			    '/browse/delete.jim', {
 				'dir': dir,
 				'files': files
 				}, function() {
@@ -812,7 +859,7 @@ var dmenuclick = function(action, el, pos)
 		    'Copying recordings can take a very long time!'))
 			return;
 
-		$.post('/cgi-bin/browse/clipboard.jim', {
+		$.post('/browse/clipboard.jim', {
 		    'act': 'add',
 		    'dir': dir,
 		    'mode': action,
@@ -857,7 +904,7 @@ var dmenuclick = function(action, el, pos)
 
 	function checkstream()
 	{
-		$.get('/cgi-bin/streamsize.jim', function(size) {
+		$.get('/browse/streamsize.jim', function(size) {
 			//console.log('Stream size: %o', size);
 			var mb = size / (1024 * 1024);
 			mb = mb|0;

var/mongoose/html/browse/shrunk.jim

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

var/mongoose/html/browse/sizes.jim

@@ -1,17 +1,11 @@
 #!/mod/bin/jimsh
 
 package require cgi
+source /mod/webif/lib/setup
 
-#puts "Content-Type: text/plain"
-puts "Content-Type: application/json"
-puts ""
+httpheader "application/json"
 
-cgi_input
-#cgi_dump
-
-#set _cgi(dir) "/media/My Video"
-
-set dir [dict get $_cgi dir]
+set dir [cgi_get dir]
 set dlen [string length "$dir/"]
 
 #9.4G	/media/My Video/Archive

var/mongoose/html/browse/streamsize.jim

@@ -2,7 +2,8 @@
 
 set stream "/mnt/hd3/Streamer_down_file"
 
-puts "Content-type: text/plain\n"
+source /mod/webif/lib/setup
+httpheader "text/plain"
 
 if {[file exists $stream]} {
 	puts -nonewline [file size $stream]

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

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

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

@@ -4,10 +4,7 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class pretty_size
 
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
+httpheader
 
 set rfile [cgi_get file]
 set ts [ts fetch $rfile]
@@ -46,6 +43,7 @@ set newname "$shname-[clock seconds]"
 puts "Renaming file group to $newname"
 ts renamegroup "$dir/$shname.ts" $newname
 exec /mod/bin/hmt "+setfilename=$newname" "$dir/$newname.hmt"
+exec /mod/bin/hmt "+shrunk" "$dir/$newname.hmt"
 
 set striptime [expr [expr [clock milliseconds] - $stripstart] / 1000.0]
 puts "Time taken: $striptime"

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

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

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

@@ -4,10 +4,7 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class pretty_size
 
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
+header
 
 set rfile [cgi_get file]
 set ts [ts fetch $rfile]
@@ -17,8 +14,6 @@ set len [$ts duration 1]
 
 set esttime $([$ts size] / 5700000)
 
-header
-
 puts "
 <link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
 <script type=text/javascript src=/js/jquery.progressbar.js></script>

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

@@ -27,7 +27,7 @@ $('#analysis').load('analyse.jim?file=' + $('#params').attr('file'),
 $('#progressbar').reportprogress(0);
 
 $('#back').button().click(function() {
-	window.location = '/cgi-bin/browse.jim?dir=' + $('#params').attr('dir');
+	window.location = '../index.jim?dir=' + $('#params').attr('dir');
 });
 
 $('#stripit').button().click(function() {

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

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

var/mongoose/html/dedup/dedup

@@ -73,6 +73,7 @@ foreach dir $dirs {
 				# Dooooo, it.
 				$ts settitle $syn
 				ts renamegroup $file $fn
+				$ts set_deduped
 			}
 		    }
 		}

var/mongoose/html/dedup/dedup.jim

@@ -4,20 +4,14 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class pretty_size altrow
 
+header
+
 source normalise.jim
 source process.jim
 
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
-
 set dir [cgi_get dir "/media/My Video"]
 set doit [cgi_get doit 0]
 
-header
-
 puts "<script type=text/javascript src=script.js></script>"
 
 puts "<fieldset style=\"display: inline\">
@@ -74,6 +68,7 @@ foreach file [readdir $dir] {
 			# Dooooo, it.
 			$ts settitle $syn
 			ts renamegroup $file $fn
+			$ts set_deduped
 			puts -nonewline "Done"
 		}
 	    }

var/mongoose/html/dedup/process.jim

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

var/mongoose/html/dedup/script.js

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

var/mongoose/html/diag/clearlog.jim

@@ -3,15 +3,11 @@
 package require cgi
 source /mod/webif/lib/setup
 
-puts "Content-Type: text/html"
-puts ""
+httpheader
 
 set logdirs {/var/log /mod/tmp /mnt/hd3}
 set logext {.log}
 
-cgi_input
-#cgi_dump
-
 set log [cgi_get file 0]
 
 set ldir [file dirname $log]

var/mongoose/html/diag/diag.jim

@@ -4,15 +4,12 @@ package require cgi
 source /mod/webif/lib/setup
 require pretty_size system.class pkg.class
 
-puts "Content-Type: text/html"
-puts ""
+header
 
 pkg loaddiagmeta
 
 set smv [system modversion 1]
 
-header
-
 puts {
 <script type=text/javascript src=/js/enadis.js></script>
 <script type=text/javascript src=script.js></script>

var/mongoose/html/diag/disk.jim

@@ -4,9 +4,6 @@ package require cgi
 source /mod/webif/lib/setup
 require system.class
 
-puts "Content-Type: text/html"
-puts ""
-
 header
 
 set space [system diskspace]

var/mongoose/html/dlna/dlna.jim

@@ -5,11 +5,6 @@ package require sqlite3
 source /mod/webif/lib/setup
 require ts.class pretty_size
 
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
-
 header
 
 #append dmsfile ".rr"

var/mongoose/html/dlna/reset.jim

@@ -3,8 +3,7 @@
 source /mod/webif/lib/setup
 require system.class
 
-puts "Content-Type: text/html"
-puts ""
+httpheader
 
 set menupath "Settings->System->Internet Setting->Content Share"
 set dbpath "/mnt/hd2/dms_cds.db"

var/mongoose/html/edit/create.jim

@@ -3,14 +3,11 @@
 package require cgi
 source /mod/webif/lib/setup
 
-cgi_input
-#cgi_dump
+httpheader "text/plain"
 
 set file [cgi_get file "/tmp/hosts"]
 if {$file eq "-"} { exit }
 
-puts "Content-Type: text/plain\n"
-
 if {[file exists $file]} {
 	puts ">>> File already exists."
 	exit

var/mongoose/html/edit/edit.jim

@@ -4,13 +4,8 @@ package require cgi
 source /mod/webif/lib/setup
 require plugin
 
-puts "Content-Type: text/html"
-puts ""
-
 header
 
-cgi_input
-#cgi_dump
 set file [cgi_get file "/tmp/hosts"]
 
 puts {

var/mongoose/html/edit/files.jim

@@ -3,11 +3,7 @@
 package require cgi
 source /mod/webif/lib/setup
 
-cgi_input
-#cgi_dump
-
-puts "Content-Type: text/html"
-puts ""
+httpheader
 
 set root [cgi_get dir]
 

var/mongoose/html/edit/put.jim

@@ -3,11 +3,7 @@
 package require cgi
 source /mod/webif/lib/setup
 
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
+httpheader
 
 set file [cgi_get file "/tmp/testfile"]
 if {$file eq "-"} { exit }

var/mongoose/html/img/mp3.png

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

var/mongoose/html/js/iajax.js

@@ -1,45 +1,38 @@
 
 jQuery.ajaxPrefilter(function(options, _, jqXHR) {
+    if (jQuery.isFunction(options.progress))
+    {
+	var xhrFactory = options.xhr;
+	var interval;
 
-    if (jQuery.isFunction(options.progress)) {
+	options.xhr = function() {
+		var xhr = xhrFactory.apply(this, arguments);
+		var partial = "";
+		var prevcount = 1;
 
-        var xhrFactory = options.xhr,
-            interval;
+		interval = setInterval(function() {
+			var responseText;
+			var jQueryPartial;
 
-        options.xhr = function() {
-            
-            var xhr = xhrFactory.apply(this, arguments),
-                partial = "",
-                prevcount = 1;
+			try {
+				responseText = xhr.responseText;
+	    
+				if (responseText &&
+				    responseText.length > partial.length)
+				{
+					options.progress(
+					    responseText.substring(
+					    partial.length));
+					partial = responseText;
+				}
+			} catch(e) {
+				if (window.console)
+					console.log(e);
+			}
+		}, options.progressInterval);
 
-            interval = setInterval(function() {
-
-                var responseText,
-                    jQueryPartial;
-
-                try {
-
-                    responseText = xhr.responseText;
-                    
-                    if (responseText && (responseText.length > partial.length))
-		    {
-
-                        partial = responseText;
-                        jQueryPartial = $(partial).filter("*")
-
-                        if (jQueryPartial.length > prevcount) {
-                            prevcount = jQueryPartial.length;
-                            options.progress(jQueryPartial.filter("*:not(:last)"));
-                        }
-                    }
-                } catch(e) {
-		    if (window.console)
-			    console.log(e);
-                }
-            }, options.progressInterval);
-
-            return xhr;
-        };
+		return xhr;
+	};
         function stop()
 	{
             if (interval)

var/mongoose/html/lib/header.jim

@@ -4,6 +4,7 @@ puts {
 <!doctype html>
 <html>
 <head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>
 }
 source /mod/webif/include/model.jim

var/mongoose/html/m/script.js

@@ -112,15 +112,15 @@ $(document).delegate('#browsepage', 'pageinit', function() {
 	//console.log('DIR: %O', dir);
 
 	// Load folder sizes
-	$.getJSON('/cgi-bin/browse/sizes.jim?dir=' + encodeURIComponent(dir),
+	$.getJSON('/browse/sizes.jim?dir=' + encodeURIComponent(dir),
 		folder_size_callback);
 
 	// Flag folders with unwatched items
-	$.getJSON('/cgi-bin/browse/newdir.jim?dir=' + encodeURIComponent(dir),
+	$.getJSON('/browse/newdir.jim?dir=' + encodeURIComponent(dir),
 		new_folder_callback);
 
 	// Flag shrunk recordings
-	$.getJSON('/cgi-bin/browse/shrunk.jim?dir=' + encodeURIComponent(dir),
+	$.getJSON('/browse/shrunk.jim?dir=' + encodeURIComponent(dir),
 		shrunk_callback);
 });
 

var/mongoose/html/pkg/pkg.jim

@@ -6,14 +6,7 @@ require settings.class pkg.class altrow
 
 if {[[settings] pkgdev]} { set filter 0 } else { set filter 1 }
 
-puts "Content-Type: text/html"
-puts "Pragma: no-cache"
-puts "Expires: Thu, 01 Jan 1970 00:00:00 GMT"
-puts ""
-
-cgi_input
-#cgi_dump
-if {![dict exists $_cgi type]} { set _cgi(type) avail }
+httpheader
 
 proc pkgrow {pkg} {
 	set name [$pkg get name]
@@ -60,7 +53,7 @@ proc pkgrow {pkg} {
 
 pkg loadmeta
 
-set type $_cgi(type)
+set type [cgi_get type "avail"]
 
 set pkgs [pkg $type]
 

var/mongoose/html/pkg/script.js

@@ -66,17 +66,19 @@ $(document).ready(function() {
 
 	function loaddata(data, isfinal)
 	{
-		//console.log('loaddata called, final=' + isfinal);
-		//console.log('Data: ' + data);
-		$('#dresults').append(data);
+		if (window.console)
+		{
+			console.log('loaddata called, final=' + isfinal);
+			console.log('Data: ' + data);
+		}
 		if (isfinal)
 		{
+			$('#dresults').text(data);
 			$('#dspinner').hide('slow');
-			if (!$('#dresults').text())
-				$('#dresults').append('Nothing to do.');
-			else
-				$('#complete').show('slow');
+			$('#complete').show('slow');
 		}
+		else
+			$('#dresults').append(data);
 	}
 
 	function execopkg(arg, pkg)
@@ -95,20 +97,16 @@ $(document).ready(function() {
 		$('#dialogue').attr('pkg', pkg);
 		$dialog.dialog('open');
 
-//		$('#dresults').load(opkg + arg, function() {
-//			$('#dspinner').hide('slow');
-//		});
-
 		$.ajax({
 			type: "GET",
 			url: opkg + arg,
 			progress: loaddata,
 			success: function(data) {
-				//console.log("ajax success");
 				loaddata(data, true);
 			},
 			error: function(_, _, e) {
-				//console.log("ajax error");
+				if (window.console)
+					console.log("ajax error");
 				alert(e);
 			}
 		});

var/mongoose/html/play/play.jim

@@ -4,11 +4,6 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class pretty_size
 
-puts "Content-Type: text/html\r\n"
-
-cgi_input
-#cgi_dump
-
 header
 
 set rfile [cgi_get file]