1.0.12 update

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

CONTROL/control

@@ -1,9 +1,11 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.0.8
+Version: 1.0.12
 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)
+Depends: webif-channelicons(>=1.1.10),mongoose(>=3.0.11),jim(>=0.75-1),jim-oo,jim-sqlite3(>=0.75),jim-cgi(>=0.7),jim-binary(>=0.75),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.5-3),smartmontools,tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6)
+Conflicts: tvdiary(<0.0.2-6)
 Suggests:
 Description: An evolving web interface for the Humax.
+Tags: http://hummy.tv/forum/threads/4723/

CONTROL/postinst

@@ -19,7 +19,7 @@ fi
 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 8 sched_backup /mod/webif/html/backup/backup.jim
 1 5 diskattrs /mod/webif/lib/bin/diskattrs
 EOM
 
@@ -37,7 +37,7 @@ if [ ! -f /mod/webif/.strip-updated ]; then
 fi
 
 /mod/webif/lib/bin/diskattrs
-/mod/webif/lib/bin/resetnew
+#/mod/webif/lib/bin/resetnew
 
 [ -f $tmpf ] && rm -f $tmpf
 

CONTROL/preinst

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# Handle moving the legacy /var/mongoose directory to /webif..
+
+if [ -h /mod/webif -a -d /mod/var/mongoose -a ! -h /mod/var/mongoose ]; then
+	echo "Relocating web interface files..."
+
+	cd /mod
+	rm webif || exit 1
+	mv var/mongoose webif || exit 1
+	cd var
+	ln -s ../webif mongoose
+fi
+
+exit 0
+

var/mongoose

@@ -0,0 +1 @@
+../webif

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/html/backup.shtml

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

var/mongoose/html/diag/rundiag.jim

@@ -1,33 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-require system.class chunked
-
-cgi_input
-#cgi_dump
-
-set diag [cgi_get diag general]
-
-start_chunked
-
-if {[system modversion 1] < 113} {
-	chunk ">>> Diagnostics only available with customised firmware 1.13 or above."
-	end_chunked
-	exit
-}
-
-chunk ">>> Beginning diagnostic $diag\r\n"
-
-set bcmd "|/bin/diag $diag"
-set fd [open $bcmd r]
-while {[gets $fd line] >= 0} {
-	chunk "$line\r\n"
-	#chunk_pad
-}
-close $fd
-chunk "\r\n"
-chunk ">>> Ending diagnostic $diag\r\n"
-
-end_chunked
-

var/mongoose/html/epg.shtml

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

var/mongoose/html/js/jquery.js

@@ -1 +0,0 @@
-jquery-1.10.2.min.js

var/mongoose/html/lib/footer.shtml

@@ -1 +0,0 @@
-<!--#exec cmd="/mod/webif/html/lib/footer.jim" -->

var/mongoose/html/lib/header.shtml

@@ -1 +0,0 @@
-<!--#exec cmd="/mod/webif/html/lib/header.jim" -->

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

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

var/mongoose/html/lib/jquery.mobile/index.html

@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-
-    <!-- Need to get a proper redirect hooked up. Blech. -->
-    <meta http-equiv="refresh" content="0;url=demos/">
-    <meta name="robots" content="noindex, follow">
-
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>jQuery Mobile</title>
-    <link rel="stylesheet"  href="css/themes/default/jquery.mobile-1.3.2.min.css">
-    <link rel="stylesheet" href="demos/_assets/css/jqm-demos.css">
-    <link rel="shortcut icon" href="demos/_assets/favicon.ico">
-    <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:300,400,700">
-    <script src="js/jquery.js"></script>
-    <script src="demos/_assets/js/index.js"></script>
-    <script src="js/jquery.mobile-1.3.2.min.js"></script>
-    <script>
-		$( document ).on( "pageshow", function(){
-			$( "p.message" ).hide().delay( 1500 ).show( "fast" );
-		});
-	</script>
-</head>
-<body>
-<div data-role="page" class="jqm-demos">
-
-	<div data-role="content" class="jqm-content">
-
-        <p class="message">Nothing to see here folks. <a href="demos/">View the demo center home page &rarr;</a></p>
-
-	</div><!-- /content -->
-
-</div><!-- /page -->
-</body>
-</html>

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

@@ -1 +0,0 @@
-jquery.mobile-1.3.2.min.css

var/mongoose/html/lib/jquery.mobile/jquery.mobile.js

@@ -1 +0,0 @@
-jquery.mobile-1.3.2.min.js

var/mongoose/include/modversion.jim

@@ -1,20 +0,0 @@
-#!/mod/bin/jimsh
-
-source /mod/webif/lib/setup
-require system.class
-
-set modver [system modversion]
-set modbuild [system modbuild]
-if {$modbuild > 0} {
-	append modver " (build $modbuild)"
-}
-
-puts "<font class=blood style=\"font-size: 0.9em; float: right; clear: right\">
-	Web interface version: [system pkgver webif]<br>
-	Custom firmware version: $modver
-"
-if {![catch {set fhtcpversion [system fhtcpversion]}]} {
-	puts "<br>Humax Version: $fhtcpversion"
-}
-puts "</font>"
-

var/mongoose/include/pkg.jim

@@ -1,46 +0,0 @@
-#!/mod/bin/jimsh
-
-source /mod/webif/lib/setup
-
-puts {
-<script type=text/javascript src=/js/packages.js></script>
-
-<style type=text/css>
-button.install
-{
-	display: none;
-	background-image: none;
-	background: #ccff99;
-}
-button.remove
-{
-	display: none;
-	background-image: none;
-	background: #ff6666;
-}
-button.upgrade
-{
-	display: none;
-}
-</style>
-
-<div id=pkgtabs>
-<ul>
-	<li>
-		<a href=/cgi-bin/pkg.jim?type=inst>
-		<span>Installed</span>
-		</a>
-	</li><li>
-		<a href=/cgi-bin/pkg.jim?type=upgr>
-		<span>Upgrades</span>
-		</a>
-	</li><li>
-		<a href=/cgi-bin/pkg.jim?type=avail>
-		<span>Available</span>
-		</a>
-	</li>
-</ul>
-</div>
-}
-
-

var/mongoose/include/services.jim

@@ -1,24 +0,0 @@
-#!/mod/bin/jimsh
-
-set services [split [exec /mod/bin/service mlist]]
-
-foreach service $services {
-	lassign [split $service ":"] name installed auto running
-
-	puts "<tr><td class=even>$name</td>"
-	if (!$installed) {
-		puts "<td colspan=3><i>Not installed</i></td></tr>"
-		continue
-	}
-
-	puts -nonewline "<td><input type=checkbox class=auto name=\"$name\""
-	if ($auto) { puts -nonewline " checked" }
-	puts "></td>"
-
-	puts -nonewline "<td><input type=checkbox class=toggle name=\"$name\""
-	if ($running) { puts -nonewline " checked" }
-	puts "></td>"
-
-	puts "</tr>"
-}
-

var/mongoose/lib/bin/strip-update

@@ -1,59 +0,0 @@
-#!/mod/bin/jimsh
-
-source /mod/webif/lib/setup
-require system.class ts.class
-
-proc do_shrink {ts} {
-	if {[$ts flag "Shrunk"]} { return }
-
-	set file [file rootname [$ts get file]]
-
-	if {[$ts inuse]} { return }
-
-	if {[catch {
-		set perc [exec /mod/bin/stripts -aq $file]
-	    } msg]} {
-		return
-	}
-
-	if {[string match {*%} $perc]} {
-		set perc [string range $perc 0 end-1]
-	} else {
-		set perc 0
-	}
-
-	if {$perc == 0} {
-		puts "  Flagging $file as shrunk..."
-		$ts set_shrunk
-	}
-}
-
-proc entries {dir callback} {
-	foreach entry [readdir -nocomplain $dir] {
-		if {![string match {*.ts} $entry} continue
-		if {[catch {set ts [ts fetch "$dir/$entry"]}]} continue
-		if {$ts == 0} continue
-		$callback $ts
-	}
-}
-
-proc scan {dir} {
-	puts "Scanning $dir..."
-	file stat "$dir/" st
-	if {$st(dev) != $::rootdev} { return }
-
-	entries $dir do_shrink
-
-	foreach entry [readdir -nocomplain $dir] {
-		if {[file isdirectory "$dir/$entry"]} {
-			scan "$dir/$entry"
-		}
-	}
-}
-
-set root [system mediaroot]
-file stat "$root/" rootstat
-set rootdev $rootstat(dev)
-
-scan $root
-

webif

@@ -1 +0,0 @@
-var/mongoose

webif/cgi-bin/cat.jim

@@ -2,7 +2,7 @@
 
 package require cgi
 source /mod/webif/lib/setup
-require system.class chunked pretty_size
+require system.class pretty_size
 
 cgi_input
 #cgi_dump
@@ -10,16 +10,14 @@ cgi_input
 set file [cgi_get file "-"]
 if {$file eq "-"} { exit }
 
-start_chunked
+httpheader "text/plain"
 
 if {![file exists $file]} {
-	chunk ">>> File $file does not exist.\r\n"
+	puts ">>> File $file does not exist.\r\n"
 } else {
-	chunk ">>> Contents of $file [pretty_size [file size $file]]\r\n"
+	puts ">>> Contents of $file [pretty_size [file size $file]]\r\n"
 	set fp [open $file r]
-	chunk [read $fp]
+	puts [read $fp]
 	close $fp
 }
 
-end_chunked
-

webif/cgi-bin/db.jim

@@ -63,7 +63,7 @@ proc db_info {db_file} {
 if {$fdb == 0} {
 	puts "Please choose database to view:<ul>"
 	foreach db $databases {
-		puts "<li><a href=$::env(REQUEST_URI)?db=[file tail $db]>
+		puts "<li><a href=$::env(SCRIPT_NAME)?db=[file tail $db]>
 		    $db</a></li>"
 	}
 	puts "</ul>"

webif/cgi-bin/env.jim

@@ -0,0 +1,9 @@
+#!/mod/bin/jimsh
+
+source /mod/webif/lib/setup
+httpheader
+
+puts "<pre>"
+parray env
+puts "</pre>"
+

webif/cgi-bin/epg/dump.jim

@@ -13,7 +13,7 @@ set raw [cgi_get raw]
 puts "<pre>"
 if { $raw == 0 } {
 	puts [epg exec dump -raw 1 -service $service -event $event]
-	puts "<a href=$env(REQUEST_URI)?$env(QUERY_STRING)&raw=1>
+	puts "<a href=$env(SCRIPT_NAME)?$env(QUERY_STRING)&raw=1>
 		Click here for extended dump</a>"
 } else {
 	puts [epg exec dumpraw -raw 1 -service $service -event $event]

webif/cgi-bin/epg/info.jim

@@ -10,7 +10,7 @@ httpheader
 
 set service [cgi_get service 0]
 set event [cgi_get event 0]
-if {![cgi_exists bare]} header
+if {![cgi_exists bare]} header else noheader
 
 set record [lindex [epg fetch dump -service $service -event $event] 0]
 $record get_channel_info

webif/cgi-bin/epg/search.jim

@@ -4,12 +4,11 @@ package require cgi
 source /mod/webif/lib/setup
 require epg.class spinner.class altrow settings.class
 
+jqplugin highlight
 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 ""]
@@ -56,6 +55,12 @@ if {$ct > 0 } {
 }
 
 set favlist [epg favlist]
+set s [settings]
+if {[$s service_style] eq "standard"} {
+	set surl xservice
+} else {
+	set surl service
+}
 
 if {[llength $records] > 0} {
 	puts {
@@ -83,8 +88,10 @@ proc rsort {v1 v2} {
 set seen {}
 set i 0
 foreach record [lsort -command rsort $records] {
+	set ename [$record get name]
+	if {$ename eq ""} continue
+
 	if {$dedup} {
-		set ename [$record get name]
 		if {$ename in $seen} continue
 		lappend seen $ename
 	}
@@ -105,7 +112,7 @@ foreach record [lsort -command rsort $records] {
 	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=/epg/$surl.jim?service=[$record get service_id]>
 	    [$record get channel_name]
 	    </a></td>"
 	puts [$record cell]

webif/cgi-bin/opkg.jim

@@ -2,7 +2,7 @@
 
 package require cgi
 source /mod/webif/lib/setup
-require pkg.class chunked
+require pkg.class
 
 cgi_input
 #cgi_dump
@@ -10,30 +10,27 @@ cgi_input
 set cmd [cgi_get cmd update]
 
 proc opkg {cmd} {
-	chunk ">>> opkg $cmd\r\n"
+	puts ">>> 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
+		puts "$line\r\n"
 	}
 	close $fd
-	chunk "\r\n"
+	puts "\r\n"
 }
 
-start_chunked
+httpheader "text/plain"
 
 if {$cmd eq "upgrade"} { opkg update }
 opkg $cmd
 
 if {$cmd eq "update" || $cmd eq "upgrade"} {
-	chunk "Updating package meta information\r\n"
+	puts "Updating package meta information\r\n"
 	pkg fetchmeta
-	chunk "Done.\r\n"
-	chunk "Updating diagnostic meta information\r\n"
+	puts "Done.\r\n"
+	puts "Updating diagnostic meta information\r\n"
 	pkg fetchdiagmeta
-	chunk "Done.\r\n"
+	puts "Done.\r\n"
 }
 
-end_chunked
-

webif/cgi-bin/restart.jim

@@ -7,7 +7,7 @@ require rsv.class system.class
 httpheader
 
 if {[cgi_get act] eq "cancel"} {
-	file delete /tmp/.restartpending
+	system restartpending 0
 	exit
 }
 
@@ -18,7 +18,8 @@ if {[cgi_get now] eq "yes"} {
 	exit
 }
 
-file delete /tmp/.restartpending
+system restartpending 0
+jqplugin progressbar
 header
 
 # Commit pending reservations on older mod versions.
@@ -27,8 +28,6 @@ if {![file exists /sbin/rsvsync] && ![file exists /mod/boot/rsvsync]} {
 }
 
 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;

webif/cgi-bin/status.jim

@@ -8,7 +8,7 @@ set runmode cli
 if {[string match {*jim} $argv0]} { set runmode cgi }
 
 set schedtime 1200 
-case $runmode {
+switch $runmode {
     cgi {
 	set type [cgi_get type "full"]
 	httpheader

webif/cgi-bin/xepg.jim

@@ -4,25 +4,29 @@ package require cgi
 source /mod/webif/lib/setup
 require settings.class
 
+jqplugin enadis
+jscss xepg.js /css/xepg.css
 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>
-}
+set s [settings]
 
-if {[[settings] chanchangenc]} {
+if {[$s chanchangenc]} {
 	puts { <script type=text/javascript src=/js/chanchangenc.js></script> }
 } else {
 	jqplugin confirmAction
 	puts { <script type=text/javascript src=/js/chanchange.js></script> }
 }
 
+if {[$s service_style] eq "standard"} {
+	set surl xservice
+} else {
+	set surl service
+}
+
 [spinner new {
 	text "Loading EPG Information..."
 	size "1.2em"
@@ -40,7 +44,7 @@ if {$stt <= $now} {
 	set current 0
 }
 
-set favgroup [[settings] channel_group]
+set favgroup [$s channel_group]
 
 set hours [expr 1.0 * [[settings] xepghours]]
 if {$hours == 0} { set hours 4.0 }
@@ -139,7 +143,7 @@ foreach e $records {
 		puts "[$e channel_icon 30]&nbsp;"
 		if {$irinst} { puts "</a>" }
 		puts "$chnum
-	    <a href=\"/cgi-bin/epg/service.jim?service=[$e get service_id]\"
+	    <a href=\"/epg/$surl.jim?service=[$e get service_id]\"
 		title=\"[$e get channel_name]\">
 	    [$e get channel_name]
 	    </a></div>"

webif/cgi-bin/xepg.js

@@ -1,7 +1,7 @@
 $(function() {
 
 $('#epgswitch').button().click(function() {
-	window.location = '/epg.shtml';
+	window.location = '/epg/list.jim';
 });
 
 $('button.nav').click(function() {

webif/html/backup/backup.js

@@ -1,7 +1,7 @@
 
 function refresh_files()
 {
-	$('#backup_files').load('/cgi-bin/backup/files.jim', function() {
+	$('#backup_files').load('files.jim', function() {
 		$('input.restore').change(function() {
 			$('#restore_button').removeAttr('disabled')
 			    .button('option', 'disabled', false);
@@ -20,7 +20,7 @@ $(document).ready(function() {
 
 	$('#backup_button').click(function() {
 		$('#backup_working').slideDown();
-		$('#results').load('/cgi-bin/backup/backup.jim?' +
+		$('#results').load('backup.jim?' +
 		    $('#backup_name').serialize(), function() {
 			$('#results').slideDown(function() {
 				$('#backup_working').slideUp();
@@ -32,7 +32,7 @@ $(document).ready(function() {
 		var backup = $('input.restore:checked').val();
 		if (confirm('Confirm deletion of ' + backup))
 		{
-			$('#results').load('/cgi-bin/backup/delete.jim?' +
+			$('#results').load('delete.jim?' +
 			    $('input.restore').serialize(), function() {
 				$('#results').slideDown(function() {
 					refresh_files();
@@ -42,7 +42,7 @@ $(document).ready(function() {
 	});
 	$('#view_button').click(function() {
 		var backup = $('input.restore:checked').val();
-		$('#results').load('/cgi-bin/backup/view.jim?' +
+		$('#results').load('view.jim?' +
 		    $('input.restore').serialize(), function() {
 			$('#results').slideDown(function() {
 				refresh_files();
@@ -54,7 +54,7 @@ $(document).ready(function() {
 		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();
-			$('#results').load('/cgi-bin/backup/restore.jim?' +
+			$('#results').load('restore.jim?' +
 			    $('input.restore').serialize(), function() {
 				$('#results').slideDown(function() {
 					$('#restore_working').slideUp();

webif/html/backup/index.jim

@@ -3,8 +3,10 @@
 source /mod/webif/lib/setup
 require altrow rsv.class
 
+jscss backup.js
+header
+
 puts {
-<script type=text/javascript src=/cgi-bin/backup/backup.js></script>
 <h2>Backup/Restore</h2>
 
 <div id=restore_warning class="hidden warningbox">
@@ -64,3 +66,5 @@ puts {
 </div>
 }
 
+footer
+

webif/html/browse/audio/audio.jim

@@ -3,19 +3,21 @@
 package require sqlite3
 package require cgi
 source /mod/webif/lib/setup
-require ts.class system.class
+require ts.class system.class settings.class
 
+jqplugin progressbar
+jscss audio.js
 header
 
+set s [settings]
+set type [$s audiomp3descr [$s audiomp3]]
+
 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>
@@ -31,7 +33,7 @@ puts "
 ></span>
 
 <div id=audiodiv style=\"padding: 1em\">
-<button id=audioit>Perform audio extraction</button>
+<button id=audioit>Perform audio extraction - $type</button>
 </div>
 
 <div id=progressdiv class=hidden>

webif/html/browse/audio/execute.jim

@@ -3,7 +3,7 @@
 package require sqlite3
 package require cgi
 source /mod/webif/lib/setup
-require ts.class system.class
+require ts.class system.class settings.class
 
 httpheader
 
@@ -18,9 +18,15 @@ 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"]
+set cmd [list ffmpeg -y -benchmark -v 0 -i "$rfile" -f mp3 -vn]
+
+if {![[settings] audiomp3]} {
+	lappend cmd -acodec copy
+}
+lappend cmd "${base}.mp3"
+
+#puts "$cmd"
+puts [exec {*}$cmd]
 
 if {[system pkginst id3v2]} {
 	puts [exec /mod/bin/id3v2 \

webif/html/browse/chunk/chunk.jim

@@ -4,6 +4,8 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class pretty_size
 
+jqplugin progressbar
+jscss chunk.js chunk.css
 header
 
 set rfile [cgi_get file]
@@ -19,10 +21,6 @@ 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>

webif/html/browse/crop/crop.jim

@@ -4,6 +4,8 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class pretty_size
 
+jqplugin progressbar
+jscss crop.js
 header
 
 set rfile [cgi_get file]
@@ -13,10 +15,6 @@ 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>
 

webif/html/browse/crop/execute.jim

@@ -34,10 +34,12 @@ if {[file exists "$origdir/$shname.ts"]} {
 }
 
 puts "Moving recording to $origdir"
-foreach f [glob -nocomplain "${base}.*"] {
-	set tail [file tail $f]
-	puts "  $tail"
-	file rename $f "$origdir/$tail"
+
+set tail [file tail $base]
+foreach ext $tsgroup {
+	if {![file exists "$base.$ext"]} continue
+	puts "  $tail.$ext"
+	file rename "$base.$ext" "${origdir}/$tail.$ext"
 }
 
 puts [exec /mod/bin/nicesplice \

webif/html/browse/decrypt/decrypt.jim

@@ -5,6 +5,8 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class
 
+jqplugin progressbar
+jscss decrypt.js
 header
 
 set rfile [cgi_get file]
@@ -14,9 +16,6 @@ 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>

webif/html/browse/decrypt/execute.jim

@@ -42,20 +42,22 @@ 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"
+set tail [file tail $base]
+foreach ext $tsgroup {
+	if {![file exists "$base.$ext"]} continue
+	puts "  $tail.$ext"
+	file rename "$base.$ext" "${origdir}/$tail.$ext"
 }
 
 file rename "$rfile.decrypting" $rfile
+file touch $rfile "$origdir/$tail.ts"
 
 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"
+		file touch "$dir/$sidecar" "$origdir/$tail.ts"
 	}
 }
 

webif/html/browse/file.jim

@@ -11,8 +11,7 @@ set type [cgi_get type]
 
 if {$file == 0} exit
 
-file stat $file st
-set sz [pretty_size $st(size)]
+set sz [pretty_size [file size $file]]
 
 if {$type eq "ts"} {
 	require epg.class ts.class

webif/html/browse/index.jim

@@ -4,6 +4,8 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class pretty_size system.class settings.class escape browse.class
 
+jqplugin contextMenu bar enadis
+jscss script.js style.css
 header
 
 set nicesplice [system pkginst nicesplice]
@@ -12,8 +14,8 @@ 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) ""
+if {![dict exists $env SCRIPT_NAME]} {
+	set env(SCRIPT_NAME) ""
 	cgi_input
 	set _cgi(dir) "/media/My Video/"
 }
@@ -50,7 +52,7 @@ proc directory {file bfile tbfile} {
 	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]\"
+	    href=\"$::env(SCRIPT_NAME)?dir=[cgi_quote_url $file]\"
 	    file=\"[cgi_quote_url $file]\">"
 	puts "$bfile</a><span class=filesize id=\"$tbfile\">
 		</span>"
@@ -101,8 +103,7 @@ proc entry {file} {{i 0}} {
 	set ext [string tolower [file extension $file]]
 	if {$ext in $::ignore || $ext ni $::include} { return }
 
-	file stat $file st
-	set rsz $st(size)
+	set rsz [file size $file]
 	set sz [pretty_size $rsz]
 
 	set base [file rootname $file]
@@ -249,16 +250,6 @@ 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 "
@@ -273,7 +264,7 @@ set stub ""
 foreach part [split $dir /] {
 	if {$stub eq "/"} { set name $part } else { set name "/$part" }
 	append stub $name
-	puts "<a href=\"$env(REQUEST_URI)?dir=[cgi_quote_url $stub]\">$name</a>
+	puts "<a href=\"$env(SCRIPT_NAME)?dir=[cgi_quote_url $stub]\">$name</a>
 }
 puts "<span class=filesize id=dirsize></span>"
 puts "</legend>"
@@ -283,7 +274,7 @@ set parent [join [lrange [split $dir /] 0 end-1] /]
 if {$parent ne ""} {
 	puts "
 	    <div class=va>
-		<a href=\"$env(REQUEST_URI)?dir=[cgi_quote_url $parent]\">
+		<a href=\"$env(SCRIPT_NAME)?dir=[cgi_quote_url $parent]\">
 		<img border=0 src=/images/711_3_09_Media_Folder_UP.png class=va>
 			\[parent directory\]</a>
 	    </div>
@@ -308,9 +299,9 @@ proc s_time {a b} {
 	}
 
 	if {[catch {file stat $a l}]} { return 0}
-	set at $l(ctime)
+	set at $l(mtime)
 	if {[catch {file stat $b l}]} { return 0}
-	set bt $l(ctime)
+	set bt $l(mtime)
 
 	if {$at < $bt} { return -1 }
 	if {$at > $bt} { return 1 }
@@ -342,7 +333,7 @@ foreach sl $sortlist {
 	set tag "Currently sorting"
 	if {$order != $index} {
 		puts "
-	    <a href=\"$env(REQUEST_URI)?$env(QUERY_STRING)&order=$index\">"
+	    <a href=\"$env(SCRIPT_NAME)?$env(QUERY_STRING)&order=$index\">"
 		set tag "Sort"
 	}
 	puts "<img class=va border=0 src=/img/$img.gif> $tag by $descr"

webif/html/browse/join/join.jim

@@ -4,18 +4,14 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class pretty_size
 
+jqplugin progressbar touchbridge
+jscss join.js join.css
 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>

webif/html/browse/mpg/mpg.jim

@@ -5,6 +5,8 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class system.class
 
+jqplugin progressbar
+jscss mpg.js
 header
 
 set rfile [cgi_get file]
@@ -13,9 +15,6 @@ 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>