tweak message

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@928 2a923420-c742-0410-a762-8d5b09965624
show current channel, retain more backups
2012-04-18 21:19:12 +00:00 · 2012-04-18 20:26:34 +00:00 · 2012-04-14 21:31:25 +00:00 · 2012-04-11 20:54:59 +00:00 · 2012-04-10 19:45:49 +00:00 · 2012-04-08 23:26:38 +00:00
893 changed files with 7815 additions and 3266 deletions
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,11 +1,9 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 0.8.3
+Version: 0.9.5-3
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
-Depends: mongoose(>=3.0-2),jim(>=0.71-1),jim-sqlite3(>=0.71-1),jim-cgi(>=0.4-1),jim-oo,jim-pack,service-control,busybox(>=1.19.3-1),lsof,epg(>=1.0.8),hmt(>=1.1.1),ssmtp
-Replaces: af123-webif
-Conflicts: af123-webif
-Suggests: ffmpeg,webif-iphone,nicesplice
+Depends: webif-channelicons,mongoose(>=3.0-7),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73),jim-cgi(>=0.5),service-control(>=1.2),busybox(>=1.19.3-1),lsof,epg(>=1.0.9),hmt(>=1.1.6),ssmtp,anacron,trm,openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.1)
+Suggests: ffmpeg,webif-iphone
 Description: An evolving web interface for the Humax.
--- a/CONTROL/postinst
+++ b/CONTROL/postinst
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+export tmpf=/tmp/cronf.$$
+
+# Add anacron jobs
+
+ana=$PKG_ROOT/etc/anacrontab
+grep -v 'backup/backup.jim' $ana > $tmpf
+(
+	cat $tmpf
+	echo "1 8 sched_backup /mod/var/mongoose/cgi-bin/backup/backup.jim"
+) > $ana
+
+$PKG_ROOT/etc/init.d/S02anacron start < /dev/null > /dev/null 2>&1 &
+
+exit 0
+
--- a/CONTROL/prerm
+++ b/CONTROL/prerm
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+export tmpf=/tmp/cronf.$$
+
+ana=/mod/etc/anacrontab
+grep -v 'backup/backup.jim' $ana > $tmpf
+cp $tmpf $ana
+
+exit 0
+
--- a/var/mongoose/cgi-bin/backup/backup.jim
+++ b/var/mongoose/cgi-bin/backup/backup.jim
@@ -13,12 +13,23 @@ puts ""
 cgi_input
 #cgi_dump

-if {![dict exists $_cgi file]} {
-	puts "No filename supplied."
-	exit
+set now [clock seconds]
+set file [file tail [cgi_get file \
+    [clock format $now -format "auto-%Y-%b-%d-%H:%M"]]]
+
+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 
+		}
+	}
 }

-set file [file tail [dict get $_cgi file]]
 set ffile "/$dir/$file.rbk"

 if {[file exists $ffile]} {
--- a/var/mongoose/cgi-bin/backup/files.jim
+++ b/var/mongoose/cgi-bin/backup/files.jim
@@ -20,7 +20,18 @@ if {![file isdirectory $dir]} {
 	exit
 }

-set backups [glob -nocomplain "$dir/*.rbk"]
+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"]]

 if {![llength $backups]} {
 	empty
--- a/var/mongoose/cgi-bin/backup/restore.jim
+++ b/var/mongoose/cgi-bin/backup/restore.jim
@@ -106,7 +106,7 @@ foreach line $data {

 	puts "    $chan"

-	if {!$hsvc} {
+	if {$hsvc eq ""} {
 		puts "        Cannot map channel name to service."
 		continue
 	}
--- a/var/mongoose/cgi-bin/browse.jim
+++ b/var/mongoose/cgi-bin/browse.jim
@@ -2,32 +2,80 @@

 package require cgi
 source /mod/var/mongoose/lib/setup
-require ts.class pretty_size system.class
+require ts.class pretty_size system.class settings.class escape

 puts "Content-Type: text/html"
 puts ""

 set nicesplice [system pkginst nicesplice]
+set flatten [system pkginst flatten]

-set ignore {.nts .thm .hmt .hmi}
-set include {.ts .avi .mpg .mpeg .wmv .mkv .mp3 .mp4 .mov}
+set ignore {.nts .thm .hmi}
+set include {.ts .avi .mpg .mpeg .wmv .mkv .mp3 .mp4 .mov .hmt}

 cgi_input
 #cgi_dump

-#set env(REQUEST_URI) ''
-#set _cgi(dir) "/media/My Video/\[Don't Die Young\]"
+if {![dict exists $env REQUEST_URI]} {
+	set env(REQUEST_URI) ""
+	set _cgi(dir) "/media/My Video/"
+}
+
+if {![dict exists $env QUERY_STRING]} { set env(QUERY_STRING) "root" }
+
+set order [cgi_get order -]
+if {$order eq "-"} {
+	set order [[settings new] sortorder]
+} else {
+	[settings new] sortorder $order
+}
+
+set model [system model]
+set dustbin [system dustbin 1]
+
+proc icon {img {hover ""} {extra ""}} {
+	puts -nonewline "<img src=$img class=va height=21 $extra"
+	if {$hover ne ""} {
+		puts -nonewline " alt=\"$hover\" title=\"$hover\""
+	}
+	puts ">"
+}

 proc directory {file bfile} {
+	global flatten
+
 	regsub -all " +" $bfile "" tbfile
 	puts "<div class=va>"
-	puts "<img border=0 class=va id=\"img$tbfile\"
-	    src=/images/711_1_09_Media_Folder.png>"
+	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>"
 	puts "<input class=\"fs fsdir\" type=checkbox>"
-	puts "<a href=\"$::env(REQUEST_URI)?dir=[cgi_quote_url $file]\"
-	    file=\"$file\">"
+	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></div>"
+		</span>"
+
+	set noflat 0
+	if $flatten {
+		if {[string match {\[*\]} [file tail $file]]} { set noflat 1 }
+		if {[file exists "$file/.noflatten"]} { set noflat 1 }
+		if $noflat { icon "/img/flat-tyre.png" "No-flatten" }
+	}
+
+	puts -nonewline "
+	      <a href=#>
+		<img class=\"dopt va\" border=0 width=45 "
+	if $flatten { puts -nonewline "noflat=$noflat " }
+	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>"
 }

 proc entry {file} {{i 0}} {
@@ -43,7 +91,8 @@ proc entry {file} {{i 0}} {
 	if {$ext in $::ignore || $ext ni $::include} { continue }

 	file stat $file st
-	set sz [pretty_size $st(size)]
+	set rsz $st(size)
+	set sz [pretty_size $rsz]

 	set base [file rootname $file]

@@ -51,6 +100,12 @@ proc entry {file} {{i 0}} {
 		set type ts
 		set ts [ts fetch $file 1]
 		set img Video_TS
+	} 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
 	} else {
 		set type gen
 		set ts 0
@@ -60,22 +115,25 @@ proc entry {file} {{i 0}} {
 	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 }
+	} 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 file=\"$file\" type=$type href=#>
+		<a class=bf title=\"$synopsis\"
+		    file=\"[cgi_quote_url $file]\" type=$type href=#>
 		    $bfile
 	        </a>
 	"
@@ -90,6 +148,7 @@ proc entry {file} {{i 0}} {
 	set odencd 1
 	set def unknown
 	set bx 0
+	set dlna 0
 	if {$type eq "ts"} {
 		# HD / SD
 		if {[$ts get definition] eq "HD"} {
@@ -99,32 +158,33 @@ proc entry {file} {{i 0}} {
 			set def SD
 			set img "172_1_26_SD"
 		}
-		puts "<img class=va src=/images/$img.png height=21>"
+		icon "/images/$img.png"

 		# Locked
 		if {[$ts flag "Locked"] > 0} {
 			set locked 1
-			puts "<img class=va src=/images/178_1_00_Icon_Lock.png
-			    height=21>"
+			icon "/images/178_1_00_Icon_Lock.png" "Locked"
 		}

 		# Encrypted
 		if {[$ts flag "Encrypted"] > 0} {
 			set encd 1
-			puts "<img class=va
-			    src=/images/749_1_26_Video_Encryption.png
-			    height=21>"
+			icon "/images/749_1_26_Video_Encryption.png" ""
 		}
 		if {![$ts flag "ODEncrypted"]} {
-			puts "<img class=va src=/img/Decrypted.png height=21>"
 			set odencd 0
+			icon "/img/Decrypted.png" "Decrypted"
 		}

 		# Guidance
 		if {[$ts flag "Guidance"] > 0} {
-			puts "<img class=va
-			    src=/images/174_1_26_GuidancePolicy.png
-			    height=21>"
+			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
 		}

 		set bx [$ts get bookmarks]
@@ -136,7 +196,8 @@ proc entry {file} {{i 0}} {
 	      <a href=#>
 		<img class=\"opt va\" border=0 width=45 type=$type did=$i
 		    locked=$locked encd=$encd def=$def new=$new bx=$bx
-		    odencd=$odencd
+		    rsize=$rsz
+		    odencd=$odencd dlna=$dlna
 		    src=/images/181_1_00_Help5_OPT_Plus.png>
 	      </a>
 	    <div class=\"results blood\" style=\"margin: 0 0 0 5em\"></div>
@@ -153,100 +214,23 @@ 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 class=delete><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>
-}
-if {[system model] eq "HDR"} {
-	puts { <li class="separator"><a href=#decrypt>Decrypt</a></li> }
-}
-if $nicesplice {
-	puts { <li class="cut separator"><a href=#crop>Crop</a></li> }
-}
-puts {
-	</ul>
-
-	<div id=renameform title="Rename media file" style="display: none">
-		<form id=renameform_form>
-		<input type=hidden name="renameorig" id="renameorig" value="">
-		<input type=hidden name="titleorig" id="titleorig" value="">
-		<table border=0>
-		<tr>
-		<th>
-			<label for="rename">
-				<b>New Filename</b>
-			</label>
-		</th>
-		<td>
-			<input type=text name="rename" id="rename"
-			    value="" size=70 maxlength=255
-			    class="text ui-widget-content ui-corner-all">
-		</td>
-		</tr>
-		<tr style="display: none" class=tstype>
-		<th>
-			<label for="renametitle" style="padding-top: 0.5em">
-				<b>New 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=savestreamform title="Save streamed content"
-	    style="display: none">
-		<div class=pre id=savestream_detail></div>
-		<form id=savestream_form>
-}
-puts "<input type=hidden name=dir value=\"$dir\">"
-puts {
-		<table border=0>
-		<tr>
-		<th>
-			<label for="savestream_name">
-				<b>Filename</b>
-			</label>
-		</th>
-		<td>
-			<input type=text name="savestream_name"
-			    id="savestream_name"
-			    value="" size=70 maxlength=255
-			    class="text ui-widget-content ui-corner-all">
-			<img id=savestream_spin src=/img/loading.gif>
-		</td>
-		</tr>
-		</table>
-		</form>
-	</div>
-
-	<div id=dialogue></div>
-	<div id=confirm title="Confirmation Required"></div>
-
+	<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 />
 }

-puts "<span style=\"display:none\" id=dir>$dir</span>"
+source /mod/var/mongoose/cgi-bin/browse/assets.jim

-# Breadcrumb path
 puts "
-      <fieldset style=\"margin: 1em\">
+	<span style=\"display:none\" id=dir>$dir</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" }
@@ -268,24 +252,84 @@ if {$parent ne ""} {
 	"
 }

-# Strip double slashes
-regsub -all -- {\/+} "$dir/*" "/" dir
+proc s_time {a b} {
+	global dir

-# Escape square brackets (for glob)
-regsub -all {([\\[])} $dir {\\\1} dir
+	set a "$dir/$a"
+	set b "$dir/$b"

-foreach file [lsort [glob -nocomplain "$dir"]] {
-	entry $file
+	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
+	}
+
+	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 files [readdir -nocomplain $dir]
+switch $order {
+	1 {		set files [lsort -command s_time $files] }
+	default {	set files [lsort $files] }
+}
+
+foreach file $files { entry "$dir/$file" }
+
 puts "<a href=# id=selectall>Select all</a> | <a href=# id=deselectall>none</a>"

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

 function disableall()
 {
 	$('button,a,input').disable();
 }

+function reloadclipboard()
+{
+	$('#clipboard')
+	    .empty()
+	    .html('<img src=/img/loading.gif> <i>Loading...</i>')
+	    .load('/cgi-bin/browse/clipboard.jim', function() {
+
+// Start Clipboard post-load actions
+
+if ($('#clipclear').length)
+	$('#paste').enable();
+else
+	$('#paste').disable();
+
+$('#clipclear').button().click(function() {
+	$.get('/cgi-bin/browse/clipboard.jim?act=clear', function() {
+		reloadclipboard();
+	});
+});
+
+$('a.clipdel').click(function() {
+	$.get('/cgi-bin/browse/clipboard.jim?act=remove&path=' +
+	    $(this).attr('path'), function() {
+		reloadclipboard();
+	});
+});
+
+$('#paste').button()
+    .click(function() {
+	disableall();
+	$('#pwdialogue').dialog({
+		title: "Pasting from clipboard",
+		modal: true, autoOpen: true,
+		height: 'auto', width: 'auto',
+		show: 'scale', hide: 'fade',
+		draggable: false, resizable: false,
+		closeOnEscape: false,
+		open: function() {
+		    $('.ui-dialog-titlebar-close').hide();
+		}
+	});
+	$('#pwfeedback').load(
+	    '/cgi-bin/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)
 {
 	var width = 85;
@@ -75,16 +112,17 @@ function new_folder_callback(data, status, xhr)
 	$.each(data, set_folder_new);
 }

-function delete_callback(file, type, id)
+function delete_callback(file, dir, id)
 {
 	var el = 'div.bf#' + id;
 	var results = el + ' .results';
-	var url = '/cgi-bin/browse/delete.jim?file=' +
-	    encodeURIComponent(file) + '&type=' + type;
 	$(results)
 	    .html('<img src=/img/loading.gif>Deleting, please wait...')
 	    .slideDown('slow')
-	    .load(url, function() {
+	    .load('/cgi-bin/browse/delete.jim', {
+		'dir': dir,
+		'files': [decodeURIComponent(file)]
+		}, function() {
 		$(el).delay(3000).slideUp(300, function() {
 			$(el).remove();
 		});
@@ -93,19 +131,19 @@ function delete_callback(file, type, id)

 function lock_callback(file, type, id)
 {
-	var url = '/cgi-bin/browse/lock.jim?file=' + encodeURIComponent(file);
+	var url = '/cgi-bin/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=' + encodeURIComponent(file);
+	var url = '/cgi-bin/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=' + encodeURIComponent(file);
+	var url = '/cgi-bin/browse/new.jim?file=' + file;
 	$.get(url, function() { window.location.reload(true); });
 }

@@ -116,6 +154,20 @@ function rename_submit()
 	    function() { window.location.reload(true); });
 }

+function drename_submit()
+{
+	var s = $('#drenameform_form').serialize();
+	$.get('/cgi-bin/browse/rename.jim?' + s,
+	    function() { window.location.reload(true); });
+}
+
+function newdir_submit()
+{
+	var s = $('#newdirform_form').serialize();
+	$.get('/cgi-bin/browse/mknewdir.jim?' + s,
+	    function() { window.location.reload(true); });
+}
+
 function savestream_submit()
 {
 	var s = $('#savestream_form').serialize();
@@ -141,7 +193,7 @@ function confirm_action(action, callback, file, type, id)
 	});
 	$('#confirm').empty().html(
 	    'Are you sure you wish to ' + action + '<br>' +
-	    '<i>' + bfile + '</i> ?'
+	    '<i>' + decodeURIComponent(bfile) + '</i> ?'
 	);
 	$confirm.dialog('open');
 }
@@ -152,7 +204,7 @@ function preparemenu(el, menu)
 	{
 		if (el.attr('def') == 'HD')
 		{
-			$('#optmenu').enableContextMenuItems('#enc');
+			$(menu).enableContextMenuItems('#enc');
 			if (el.attr('encd') == 1)
 				$(menu).changeContextMenuItem('#enc',
 				    'Remove Enc');
@@ -162,50 +214,81 @@ function preparemenu(el, menu)
 		}

 		if (el.attr('bx') > 0)
-			$('#optmenu').enableContextMenuItems('#crop');
+			$(menu).enableContextMenuItems('#crop');
 		else
-			$('#optmenu').disableContextMenuItems('#crop');
+			$(menu).disableContextMenuItems('#crop');

-		$('#optmenu').enableContextMenuItems('#new');
+		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');


-		$('#optmenu').enableContextMenuItems('#lock');
+		$(menu).enableContextMenuItems('#lock');
 		if (el.attr('locked') == 1)
 		{
 			$(menu).changeContextMenuItem('#lock', 'Unlock');
-			$('#optmenu').disableContextMenuItems('#delete');
+			$(menu).disableContextMenuItems('#delete');
 		}
 		else
 		{
 			$(menu).changeContextMenuItem('#lock', 'Lock');
-			$('#optmenu').enableContextMenuItems('#delete');
+			$(menu).enableContextMenuItems('#delete');
 		}

-		if (el.attr('odencd') == 1)
-			$('#optmenu').enableContextMenuItems('#decrypt');
+		if (el.attr('odencd') == 1 && el.attr('dlna') == 1)
+			$(menu).enableContextMenuItems('#decrypt');
 		else
-			$('#optmenu').disableContextMenuItems('#decrypt');
-	
+			$(menu).disableContextMenuItems('#decrypt');
+
+		if (el.attr('odencd') == 1)
+		{
+			$(menu).disableContextMenuItems('#audio');
+			$(menu).disableContextMenuItems('#mpg');
+		}
+		else
+		{
+			$(menu).enableContextMenuItems('#audio');
+			$(menu).enableContextMenuItems('#mpg');
+		}
 	}
 	else
 	{
-		$('#optmenu').enableContextMenuItems('#delete');
-		$('#optmenu').disableContextMenuItems('#lock');
-		$('#optmenu').disableContextMenuItems('#enc');
-		$('#optmenu').disableContextMenuItems('#new');
-		$('#optmenu').disableContextMenuItems('#decrypt');
-		$('#optmenu').disableContextMenuItems('#crop');
+		$(menu).enableContextMenuItems('#delete');
+		$(menu).disableContextMenuItems('#lock');
+		$(menu).disableContextMenuItems('#enc');
+		$(menu).disableContextMenuItems('#new');
+		$(menu).disableContextMenuItems('#decrypt');
+		$(menu).disableContextMenuItems('#audio');
+		$(menu).disableContextMenuItems('#mpg');
+		$(menu).disableContextMenuItems('#crop');
+		$(menu).disableContextMenuItems('#chunk');
 	}

 }

+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');
+	}
+}

 $(document).ready(function() {

+dir = $('#dir').text();
+
 var menuclick = function(action, el, pos)
 {
 	var file = $(el).parent().prevAll('a.bf').last().attr('file');
@@ -217,7 +300,18 @@ var menuclick = function(action, el, pos)
 	{
 	    case 'delete':
 		confirm_action('delete', delete_callback, file,
-		    type, id);
+		    dir, id);
+		break;
+
+	    case 'copy':
+		if (!confirm('Are you sure? Copying recordings takes a long time!'))
+			break;
+		// Fallthrough
+	    case 'cut':
+		$.get('/cgi-bin/browse/clipboard.jim?act=add&mode=' + action +
+		    '&path=' + file, function() {
+			reloadclipboard();
+		    });
 		break;

 	    case 'lock':
@@ -236,8 +330,8 @@ var menuclick = function(action, el, pos)
 		break;

 	    case 'rename':
-		$('#rename').val(bfile);
-		$('#renameorig').val(file);
+		$('#rename').val(decodeURIComponent(bfile));
+		$('#renameorig').val(decodeURIComponent(file));

 		$('#titleorig').val('');
 		$('#renametitle').val('');
@@ -247,7 +341,7 @@ var menuclick = function(action, el, pos)
 		if (type == 'ts')
 		{
 			$.getJSON('/cgi-bin/browse/epgtitle.jim?file=' +
-			    encodeURIComponent(file), epginfo_callback);
+			    file, epginfo_callback);
 		}

 		$('#renameform').dialog('open');
@@ -255,17 +349,91 @@ var menuclick = function(action, el, pos)

 	    case 'download':
 		window.location.href = '/cgi-bin/browse/download.jim?file=' +
-		    encodeURIComponent(file);
+		    file;
 		break;

 	    case 'crop':
-		window.location.href = '/cgi-bin/browse/crop.jim?file=' +
-		    encodeURIComponent(file);
+		window.location.href = '/cgi-bin/browse/crop/crop.jim?file=' +
+		    file;
+		break;
+
+	    case 'chunk':
+		window.location.href = '/cgi-bin/browse/chunk/chunk.jim?file=' +
+		    file;
 		break;

 	    case 'decrypt':
-		window.location.href = '/cgi-bin/browse/decrypt.jim?file=' +
-		    encodeURIComponent(file);
+		window.location.href =
+		    '/cgi-bin/browse/decrypt/decrypt.jim?file=' + file;
+		break;
+
+	    case 'audio':
+		window.location.href = '/cgi-bin/browse/audio/audio.jim?file=' +
+		    file;
+		break;
+
+	    case 'mpg':
+		window.location.href = '/cgi-bin/browse/mpg/mpg.jim?file=' +
+		    file;
+		break;
+
+	    default:
+		alert('Unhandled action: ' + action);
+		break;
+	}
+};
+
+var dmenuclick = function(action, el, pos)
+{
+	var direl = $(el).parent().parent();
+	var file = $(el).parent().prevAll('a.dbf').last().attr('file');
+	var bfile = file.replace(/.*\//g, '');
+	bfile = bfile.replace(/[\x00-\x1f]+/g, '');
+	var results = $(el).parent().next('div.results');
+
+	switch (action)
+	{
+	    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('/cgi-bin/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('/cgi-bin/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 'flat':
+		var url = '/cgi-bin/browse/flat.jim?file=' + file;
+		$.get(url, function() { window.location.reload(true); });
 		break;

 	    default:
@@ -284,9 +452,25 @@ var menuclick = function(action, el, pos)
 		menuclick
 	);

+	$('img.dopt').contextMenu(
+		{
+			menu: 'doptmenu',
+			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",
@@ -294,23 +478,43 @@ var menuclick = function(action, el, pos)
 		height: 600, width: 700,
 		show: 'scale', hide: 'fade',
 		draggable: true, resizable: true,
-		buttons: {
-			"Close": function() {
-				$(this).dialog('close');
-			}
-		},
+		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 = '/cgi-bin/browse/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 url = '/cgi-bin/browse/file.jim?file=' +
-		    encodeURIComponent(file) + '&type=' + type;
-		$('#dialogue').load(url);
+		var opt = $(this).nextAll('a').find('img.opt');
+
+		var url = '/cgi-bin/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');
 	});

@@ -327,6 +531,19 @@ var menuclick = function(action, el, pos)
 		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(''); }
+	});
+
 	$('#savestreamform').dialog({
 		autoOpen: false,
 		height: 'auto', width: 'auto',
@@ -347,8 +564,6 @@ var menuclick = function(action, el, pos)
 		show: 'fade', hide: 'fade',
 		draggable: false, resizable: false
 	});
-	
-	var dir = $('#dir').text();

 	// Load folder sizes
 	$.getJSON('/cgi-bin/browse/sizes.jim?dir=' + encodeURIComponent(dir),
@@ -358,13 +573,16 @@ var menuclick = function(action, el, pos)
 	$.getJSON('/cgi-bin/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 = '/cgi-bin/dedup.jim?dir='
+		window.location = '/dedup/dedup.jim?dir='
 		    + encodeURIComponent(dir);
 	});

@@ -389,10 +607,10 @@ var menuclick = function(action, el, pos)
 	    .click(function() {
 		var files = new Array();
 		var els = $('input.fsts:checked + a').each(function() {
-			files.push(encodeURIComponent($(this).attr('file')));
+			files.push($(this).attr('file'));
 		});
 		//console.log("%o", files);
-		window.location.href = '/cgi-bin/browse/join.jim?files=' +
+		window.location.href = '/cgi-bin/browse/join/join.jim?files=' +
 		    files.join();
 	    });

@@ -400,7 +618,7 @@ var menuclick = function(action, el, pos)
 	    .click(function() {
 		var files = new Array();
 		var els = $('input.fs:checked + a').each(function() {
-			files.push(encodeURIComponent($(this).attr('file')));
+			files.push(decodeURIComponent($(this).attr('file')));
 		});
 		//console.log("%o", files);
 		var str = 'Are you sure you want to delete ' + files.length +
@@ -411,20 +629,74 @@ var menuclick = function(action, el, pos)
 		{
 			disableall();
 			$('#deletewait').slideDown('slow');
-			window.location.href =
-			    '/cgi-bin/browse/mdelete.jim?dir=' +
-			    encodeURIComponent(dir) + '&files=' +
-		    	    files.join();
+
+			$('#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(
+			    '/cgi-bin/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('/cgi-bin/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').enable();
+			$('#delete,#cut,#copy').enable();
 		else
-			$('#delete').disable();
-	
+			$('#delete,#cut,#copy').disable();
+
 		var num = $('input.fsts:checked').size();
 		if (num > 1)
 			$('#join').enable();
--- a/var/mongoose/cgi-bin/browse/chunk/chunk.css
+++ b/var/mongoose/cgi-bin/browse/chunk/chunk.css
@@ -0,0 +1,6 @@
+
+div.progressbar
+{
+	width: 200px;
+}
+
--- a/var/mongoose/cgi-bin/browse/chunk/chunk.jim
+++ b/var/mongoose/cgi-bin/browse/chunk/chunk.jim
@@ -0,0 +1,72 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class pretty_size
+
+puts "Content-Type: text/html\r\n\r\n"
+
+cgi_input
+#cgi_dump
+
+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) }
+
+header
+
+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>
+"
+
--- a/var/mongoose/cgi-bin/browse/chunk/chunk.js
+++ b/var/mongoose/cgi-bin/browse/chunk/chunk.js
@@ -0,0 +1,76 @@
+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 = '/cgi-bin/browse.jim?dir=' + dir;
+});
+
+});
+
--- a/var/mongoose/cgi-bin/browse/chunk/extract.jim
+++ b/var/mongoose/cgi-bin/browse/chunk/extract.jim
@@ -0,0 +1,38 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class pretty_size
+
+puts "Content-Type: text/html\r\n\r\n"
+
+cgi_input
+#cgi_dump
+
+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]"
+
--- a/var/mongoose/cgi-bin/browse/chunk/progress.jim
+++ b/var/mongoose/cgi-bin/browse/chunk/progress.jim
@@ -0,0 +1,17 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class
+
+puts "Content-Type: text/html\r\n\r\n"
+
+cgi_input
+#cgi_dump
+
+set file [cgi_get file]
+set part [cgi_get part]
+
+set rfile "[file rootname $file].part$part"
+puts [file size $rfile]
+
--- a/var/mongoose/cgi-bin/browse/clipboard.jim
+++ b/var/mongoose/cgi-bin/browse/clipboard.jim
@@ -0,0 +1,119 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/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 ""
+
+cgi_input 1
+#cgi_dump
+
+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 match "$dir/*" $p]} {
+			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]}
+			}
+		} else {
+			set root [file rootname $path]
+			# Protect special characters in root.
+			# In particular [] characters which are used a lot
+			# for torrent names.
+			regsub -all {([\\["$])} $root {\\\1} root
+			foreach f [glob -nocomplain "${root}.*"] {
+				if {$mode eq "cut"} {
+					catch {file rename $f \
+					    "$dir/[file tail $f]"}
+				} else {
+					catch {file copy $f \
+					    "$dir/[file tail $f]"}
+				}
+			}
+		}
+	}
+	$cb clear
+	$cb save
+    }
+}
+
--- a/var/mongoose/cgi-bin/browse/crop.jim
+++ b/var/mongoose/cgi-bin/browse/crop.jim
@@ -1,192 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/var/mongoose/lib/setup
-require ts.class pretty_size
-
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
-
-set tsfile [cgi_get file]
-set rfile [file normalize $tsfile]
-set ts [ts fetch $rfile]
-set dir [file dirname $rfile]
-
-set len [$ts duration 1]
-
-if {[cgi_get do] eq "it"} {
-
-	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"
-
-	set croptime [expr [expr [clock milliseconds] - $cropstart] / 1000.0]
-	puts "Time taken: $croptime"
-
-	exit
-}
-
-header
-
-puts "
-<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
-<script type=\"text/javascript\" src=\"/js/jquery.progressbar.js\"></script>
-
-<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>
-"
-
-puts "
-<div id=cropdiv>
-<button id=cropit>Perform crop operation</button>
-</div>
-<div id=progressdiv style=\"display: none\">
-Cropping: <div id=progressbar></div>
-<button id=back
-    dir=\"[cgi_quote_url $dir]\"
-    rfile=\"[cgi_quote_url $rfile]\"
-    perc=\"$keepperc\"
-    style=\"display: none\">Back to media list</button>"
-puts {
-<div id=output class=pre style="margin-top: 10px"></div>
-</div>
-
-<script type=text/javascript>
-
-var handle = 0;
-
-function update()
-{
-	$.get('/cgi-bin/browse/crop_progress.jim'
-	    + '?perc=' + $('#back').attr('perc')
-	    + '&file=' + $('#back').attr('rfile'),
-	    function(data) {
-		if (handle)
-			$('#progressbar').reportprogress(data);
-	});
-}
-
-$(document).ready(function() {
-
-$('#progressbar').reportprogress(0);
-
-$('#back').button().click(function() {
-	window.location = '/cgi-bin/browse.jim?dir=' + $(this).attr('dir');
-});
-
-$('#cropit').button().click(function() {
-	$('#cropdiv').hide('slow');
-	$('#progressdiv').show('slow');
-	handle = setInterval("update()", 1000);
-	$('#output').text('Please do not interrupt...')
-	    .load(document.URL + '&do=it',
-	    function() {
-		clearInterval(handle);
-		handle = 0;
-		$('#back').show();
-		$('#progressbar').reportprogress(100);
-	});
-});
-
-});
-</script>
-</div>
-
-}
-
--- a/var/mongoose/cgi-bin/browse/crop/crop.jim
+++ b/var/mongoose/cgi-bin/browse/crop/crop.jim
@@ -0,0 +1,117 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class pretty_size
+
+puts "Content-Type: text/html\r\n\r\n"
+
+cgi_input
+#cgi_dump
+
+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>
+<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>
+
+"
+
--- a/var/mongoose/cgi-bin/browse/crop/crop.js
+++ b/var/mongoose/cgi-bin/browse/crop/crop.js
@@ -0,0 +1,38 @@
+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 = '/cgi-bin/browse.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);
+	});
+});
+
+});
+
--- a/var/mongoose/cgi-bin/browse/crop/execute.jim
+++ b/var/mongoose/cgi-bin/browse/crop/execute.jim
@@ -0,0 +1,52 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class pretty_size
+
+puts "Content-Type: text/html\r\n\r\n"
+
+cgi_input
+#cgi_dump
+
+set rfile [cgi_get file]
+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"
+
+set croptime [expr [expr [clock milliseconds] - $cropstart] / 1000.0]
+puts "Time taken: $croptime"
+
--- a/var/mongoose/cgi-bin/browse/crop/progress.jim
+++ b/var/mongoose/cgi-bin/browse/crop/progress.jim
--- a/var/mongoose/cgi-bin/browse/decrypt.jim
+++ b/var/mongoose/cgi-bin/browse/decrypt.jim
@@ -1,129 +0,0 @@
-#!/mod/bin/jimsh
-
-package require sqlite3
-package require cgi
-source /mod/var/mongoose/lib/setup
-require ts.class
-
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
-
-set tsfile [cgi_get file]
-set rfile [file normalize $tsfile]
-set ts [ts fetch $rfile]
-set dir [file dirname $rfile]
-set len [$ts duration 1]
-lassign [$ts dlnaloc] url
-
-if {[cgi_get do] eq "it"} {
-
-	set base [file rootname $rfile]
-	set origdir "$dir/_original"
-	if {![file exists $origdir]} { file mkdir $origdir }
-
-	set shname [file tail $base]
-	puts "Processing $shname"
-
-	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"
-	}
-
-	exit
-}
-
-header
-
-puts "
-<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
-<script type=\"text/javascript\" src=\"/js/jquery.progressbar.js\"></script>
-
-<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."
-	exit
-}
-
-puts {
-
-<div style="margin-top: 10px"></div>
-<div id=decryptdiv><button id=decryptit>Perform decryption</button></div>
-<div id=progressdiv style="display: none">
-Decrypting: <div id=progressbar></div>
-}
-puts "<button id=back
-    dir=\"[cgi_quote_url $dir]\"
-    rfile=\"[cgi_quote_url $rfile]\"
-    style=\"display: none\">Back to media list</button>"
-puts {
-<div id=output class=pre style="margin-top: 10px"></div>
-</div>
-
-<script type=text/javascript>
-
-var handle = 0;
-
-function update()
-{
-	$.get('/cgi-bin/browse/decrypt_progress.jim?file='
-	    + $('#back').attr('rfile'), function(data) {
-		if (handle)
-			$('#progressbar').reportprogress(data);
-	});
-}
-
-$(document).ready(function() {
-
-$('#progressbar').reportprogress(0);
-
-$('#back').button().click(function() {
-	window.location = '/cgi-bin/browse.jim?dir=' + $(this).attr('dir');
-});
-
-$('#decryptit').button().click(function() {
-	$('#decryptdiv').hide('slow');
-	$('#progressdiv').show('slow');
-	handle = setInterval("update()", 1000);
-	$('#output').load(document.URL + '&do=it', function() {
-		clearInterval(handle);
-		handle = 0;
-		$('#back').show();
-		$('#progressbar').reportprogress(100);
-	});
-});
-
-});
-</script>
-</div>
-
-}
-
--- a/var/mongoose/cgi-bin/browse/decrypt/decrypt.jim
+++ b/var/mongoose/cgi-bin/browse/decrypt/decrypt.jim
@@ -0,0 +1,72 @@
+#!/mod/bin/jimsh
+
+package require sqlite3
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class
+
+puts "Content-Type: text/html\r\n\r\n"
+
+cgi_input
+#cgi_dump
+
+set rfile [cgi_get file]
+set ts [ts fetch $rfile]
+set dir [file dirname $rfile]
+set len [$ts duration 1]
+lassign [$ts dlnaloc] url
+
+header
+
+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>
+
+"
+
--- a/var/mongoose/cgi-bin/browse/decrypt/decrypt.js
+++ b/var/mongoose/cgi-bin/browse/decrypt/decrypt.js
@@ -0,0 +1,35 @@
+
+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 = '/cgi-bin/browse.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);
+	});
+});
+
+});
+
--- a/var/mongoose/cgi-bin/browse/decrypt/execute.jim
+++ b/var/mongoose/cgi-bin/browse/decrypt/execute.jim
@@ -0,0 +1,66 @@
+#!/mod/bin/jimsh
+
+package require sqlite3
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class
+
+puts "Content-Type: text/html\r\n\r\n"
+
+cgi_input
+#cgi_dump
+
+set rfile [cgi_get file]
+set ts [ts fetch $rfile]
+set dir [file dirname $rfile]
+set len [$ts duration 1]
+lassign [$ts dlnaloc] url
+
+if {$url eq ""} {
+	puts "This file has not been indexed by the media server.
+	    Cannot decrypt."
+	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"
+
--- a/var/mongoose/cgi-bin/browse/decrypt/progress.jim
+++ b/var/mongoose/cgi-bin/browse/decrypt/progress.jim
--- a/var/mongoose/cgi-bin/browse/delete.jim
+++ b/var/mongoose/cgi-bin/browse/delete.jim
@@ -1,28 +1,101 @@
 #!/mod/bin/jimsh

 package require cgi
-source /mod/var/mongoose/lib/ts.class
+source /mod/var/mongoose/lib/setup
+require ts.class pretty_size system.class tdelete

-puts "Content-Type: text/html"
-puts ""
+puts "Content-Type: text/html\r\n"

 cgi_input
 #cgi_dump

-set file [dict get $_cgi file]
-set type [dict get $_cgi type]
+set dir [cgi_get dir]
+regsub -all {([\\["$])} $dir {\\\1} dir

-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
+#puts "DIR: ($dir)"
+
+if {[system pkginst undelete]} {
+	set dustbin [system dustbin]
+} else {
+	set dustbin ""
 }

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

--- a/var/mongoose/cgi-bin/browse/download.jim
+++ b/var/mongoose/cgi-bin/browse/download.jim
@@ -11,20 +11,23 @@ cgi_input
 #cgi_dump

 set file [cgi_get file]
-set rfile [file normalize $file]
-set ts [ts fetch $file]

 # Default to just downloading the raw file.
 set url $file
 set mime "video/ts"

-# 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]
-	if {[llength $dlna]} { lassign $dlna url mime }
+if {[string match {*.ts} $file]} {
+	if {![catch {set ts [ts fetch $file]}]} {

-	#puts "DLNA: $dlna"
+		# 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]
+			if {[llength $dlna]} { lassign $dlna url mime }
+
+			#puts "DLNA: $dlna"
+		}
+	}
 }

 puts "Content-Type: text/plain"
--- a/var/mongoose/cgi-bin/browse/file.jim
+++ b/var/mongoose/cgi-bin/browse/file.jim
@@ -65,22 +65,28 @@ if {$type eq "ts"} {
 	<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).</td>
+	<td>[$ts duration] minute(s).
+	    <font class=also>(Scheduled: [expr [$ts get scheddur] / 60])
+	    </font></td>
 </tr><tr>
 	<th>Size</th>
 	<td>$sz</td>
 "
-set dlna [$ts dlnaloc]
-lassign $dlna url
-if {[llength $dlna]} {
+lassign [$ts dlnaloc] url
+if {$url ne ""} {
 	puts "</tr><tr><th>DLNA&nbsp;URL</th>
 	   <td><a href=\"$url\">$url</a></td>"
 }
--- a/var/mongoose/cgi-bin/browse/flat.jim
+++ b/var/mongoose/cgi-bin/browse/flat.jim
@@ -0,0 +1,28 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/ts.class
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+set dir [cgi_get file]
+if {![file isdirectory $dir]} { exit }
+set noflat 0
+if {[string match {\[*\]} [file tail $dir]]} { 
+	set ndir [string range [file tail $dir] 1 end-1]
+	file rename $dir "[file dirname $dir]/$ndir"
+	puts "Unflagged directory as noflatten."
+	exit
+}
+if {[file exists "$dir/.noflatten"]} {
+	file delete "$dir/.noflatten"
+	puts "Unflagged directory as noflatten."
+} else {
+	close [open "$dir/.noflatten" w]
+	puts "Flagged directory as noflatten."
+}
+
--- a/var/mongoose/cgi-bin/browse/join.jim
+++ b/var/mongoose/cgi-bin/browse/join.jim
@@ -1,136 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/var/mongoose/lib/setup
-require ts.class pretty_size
-
-puts "Content-Type: text/html\r\n\r\n"
-header
-
-cgi_input 1
-#cgi_dump
-
-puts {
-<style>
-#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; }
-</style>
-
-<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
-<script type="text/javascript" src="/js/jquery.progressbar.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>
-"
-
-puts {
-<script type=text/javascript>
-
-$('#filelist li').hover(
-    function() { $(this).css('cursor', 'pointer'); },
-    function() { $(this).css('cursor', 'auto'); }
-);
-
-var handle = 0;
-
-function update()
-{
-	$.get('/cgi-bin/browse/join_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 = '/cgi-bin/browse.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('/cgi-bin/browse/join_backend.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');
-});
-
-});
-</script>
-}
-
-footer
-
--- a/var/mongoose/cgi-bin/browse/join/execute.jim
+++ b/var/mongoose/cgi-bin/browse/join/execute.jim
--- a/var/mongoose/cgi-bin/browse/join/join.css
+++ b/var/mongoose/cgi-bin/browse/join/join.css
@@ -0,0 +1,6 @@
+#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; }
+
--- a/var/mongoose/cgi-bin/browse/join/join.jim
+++ b/var/mongoose/cgi-bin/browse/join/join.jim
@@ -0,0 +1,65 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class pretty_size
+
+puts "Content-Type: text/html\r\n\r\n"
+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
+
--- a/var/mongoose/cgi-bin/browse/join/join.js
+++ b/var/mongoose/cgi-bin/browse/join/join.js
@@ -0,0 +1,62 @@
+
+$('#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 = '/cgi-bin/browse.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');
+});
+
+});
+
--- a/var/mongoose/cgi-bin/browse/join/progress.jim
+++ b/var/mongoose/cgi-bin/browse/join/progress.jim
--- a/var/mongoose/cgi-bin/browse/mdelete.jim
+++ b/var/mongoose/cgi-bin/browse/mdelete.jim
@@ -1,55 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/var/mongoose/lib/setup
-require ts.class pretty_size
-
-puts "Content-Type: text/html\r\n\r\n"
-header
-
-cgi_input 1
-#cgi_dump
-set dir [cgi_unquote_input [cgi_get dir]]
-
-puts "<div id=deleting class=blood><img src=/img/loading.gif>Deleting...</div>"
-puts "<ul style=\"list-style-type: square\">"
-foreach file [split [cgi_get files] ","] {
-	set file [cgi_unquote_input $file]
-	puts -nonewline "<li>\"$file\"..."
-
-	if {[file isdirectory $file]} {
-		puts -nonewline "Directory..."
-		puts [exec /mod/bin/busybox/rm -rf $file]
-		puts -nonewline "Done..."
-	} elseif {[string match {*.ts} $file]} {
-		set ts [ts fetch $file]
-		if {[catch {$ts delete} msg]} {
-			puts -nonewline "Error loading TS file..."
-		} else {
-			puts -nonewline "Done..."
-		}
-	} else {
-		if {[catch {file delete $ts} msg]} {
-			puts -nonewline "Error: $msg"
-		} else {
-			catch {file delete "[file rootname $file].hmi"}
-			puts -nonewline "Done..."
-		}
-	}
-	puts "</li>"
-}
-puts "</ul>"
-puts "<button id=back dir=\"$dir\">Back to media list</button>";
-
-puts {
-<script type=text/javascript>
-$('#deleting').slideUp('slow');
-$('#back').button().click(function() {
-	window.location.href = '/cgi-bin/browse.jim?dir=' +
-	    encodeURIComponent($('#back').attr('dir'));
-});
-</script>
-}
-
-footer
-
--- a/var/mongoose/cgi-bin/browse/mknewdir.jim
+++ b/var/mongoose/cgi-bin/browse/mknewdir.jim
@@ -0,0 +1,15 @@
+#!/mod/bin/jimsh
+
+package require cgi
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+set dir [cgi_get dir -]
+set name [cgi_get newdirname "New Folder"]
+
+file mkdir "$dir/$name"
+
--- a/var/mongoose/cgi-bin/browse/mpg/execute.jim
+++ b/var/mongoose/cgi-bin/browse/mpg/execute.jim
@@ -0,0 +1,31 @@
+#!/mod/bin/jimsh
+
+package require sqlite3
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class system.class
+
+puts "Content-Type: text/html\r\n\r\n"
+
+cgi_input
+#cgi_dump
+
+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"
+
--- a/var/mongoose/cgi-bin/browse/mpg/mpg.jim
+++ b/var/mongoose/cgi-bin/browse/mpg/mpg.jim
@@ -0,0 +1,52 @@
+#!/mod/bin/jimsh
+
+package require sqlite3
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class system.class
+
+puts "Content-Type: text/html\r\n\r\n"
+
+cgi_input
+#cgi_dump
+
+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>
+<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>
+
+"
+
--- a/var/mongoose/cgi-bin/browse/mpg/mpg.js
+++ b/var/mongoose/cgi-bin/browse/mpg/mpg.js
@@ -0,0 +1,35 @@
+
+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 = '/cgi-bin/browse.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);
+	});
+});
+
+});
+
--- a/var/mongoose/cgi-bin/browse/mpg/progress.jim
+++ b/var/mongoose/cgi-bin/browse/mpg/progress.jim
@@ -0,0 +1,26 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class
+
+puts "Content-Type: text/html\r\n\r\n"
+
+cgi_input
+#cgi_dump
+
+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
+}
+
--- a/var/mongoose/cgi-bin/browse/play.jim
+++ b/var/mongoose/cgi-bin/browse/play.jim
@@ -0,0 +1,51 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class pretty_size
+
+puts "Content-Type: text/html\r\n"
+
+cgi_input
+#cgi_dump
+
+header
+
+set rfile [cgi_get file]
+set ts [ts fetch $rfile]
+if {[catch {$ts get file}]} {
+	puts "Invalid TS file, '$rfile'"
+	exit
+}
+
+if {![$ts flag "ODEncrypted"]} {
+	set url $rfile
+} else {
+	lassign [$ts dlnaloc] url
+	if {$url eq ""} {
+		alert("Media is encrypted and not indexed by the DLNA Server.");
+	}
+}
+
+puts "
+<span id=url style=\"display: none\">$url</span>
+"
+
+puts {
+<script language="javascript" src="/js/jquery-vlc.js"></script>
+<link rel="stylesheet" type="text/css" href="/css/vlc.css" />
+<script type=text/javascript src=play.js></script>
+
+<fieldset class=cleft style="margin: 0 1em 1em 1em">
+<legend>VLC Player</legend>
+}
+puts "<span class=also>Now playing: $rfile, [$ts duration] minutes.</span>"
+puts {
+<div id=vlc></div>
+
+<div class=also id=info style="float: right">
+</div>
+
+</fieldset>
+}
+
--- a/var/mongoose/cgi-bin/browse/play.js
+++ b/var/mongoose/cgi-bin/browse/play.js
@@ -0,0 +1,13 @@
+
+$(document).ready(function() {
+
+var url = $('#url').text();
+
+var vlc = VLCobject.embedPlayer('vlc', 800, 450, true);
+vlc.play(encodeURI(url));
+
+if (window.console)
+	console.log("Playing: %o", url);
+
+});
+
--- a/var/mongoose/cgi-bin/browse/sizes.jim
+++ b/var/mongoose/cgi-bin/browse/sizes.jim
@@ -16,11 +16,10 @@ 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 [file tail [lindex $fields 1]]
-#	set node [lindex [split [lindex $fields 1] /] end]
+regsub -all {([\\["$])} $dir {\\\1} xdir
+foreach line [split [exec /mod/bin/busybox/du -h -d 1 "$dir/"] "\n"] {
+	lassign [split $line "\t"] size node
+	regsub -- "^$xdir/" $node "" node
 	puts "\"$node\" : \"$size\","
 }

--- a/var/mongoose/cgi-bin/browse/style.css
+++ b/var/mongoose/cgi-bin/browse/style.css
@@ -0,0 +1,17 @@
+
+div.brow
+{
+	float: left;
+	clear: left;
+}
+
+div.cliplist span
+{
+	display: block;
+}
+
+#clipclear
+{
+	margin-top: 1em;
+}
+
--- a/var/mongoose/cgi-bin/cfwreset
+++ b/var/mongoose/cgi-bin/cfwreset
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo "Content-Type: text/plain"
-echo
-
-/bin/rm -rf /mod/*
-
--- a/var/mongoose/cgi-bin/cfwreset.cgi
+++ b/var/mongoose/cgi-bin/cfwreset.cgi
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+echo "Content-Type: text/plain"
+echo
+
+touch /var/lib/humaxtv/mod/_RESET_CUSTOM_FIRMWARE_ENVIRONMENT
+
--- a/var/mongoose/cgi-bin/channel.jim
+++ b/var/mongoose/cgi-bin/channel.jim
@@ -32,17 +32,19 @@ puts "
 		<th>Frequency</th>
 		<th>Signal Strength</th>
 		<th>Signal Quality</th>
+		<th>Network</th>
 		<th>Mux</th>
 		<th>Channels</th>
 		<th>&gt;799</th>
 	</tr>
 "
 foreach tw [$db query {
-		select tsIdx, usTsID, ulFrequency, ucLevel, ucQuality
-		from TBL_TS
+		select tsIdx, szNetName, usTsID, ulFrequency, ucLevel, ucQuality
+		from TBL_TS join TBL_NET using (netIdx)
 		order by ulFrequency
 	}] {
-	lassign $tw x tsIdx x usTsID x ulFrequency x ucLevel x ucQuality
+	lassign $tw \
+	    x tsIdx x netName x usTsID x ulFrequency x ucLevel x ucQuality

 	altrow
 	puts "
@@ -51,6 +53,7 @@ foreach tw [$db query {
 	"
 	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
@@ -59,7 +62,7 @@ foreach tw [$db query {
 		order by usLcn
 		} $tsIdx]

-	set mux "???"
+	set mux "Local"
 	set ehs 0
 	foreach chan $channels {
 		lassign $chan x lcn x name
@@ -72,6 +75,7 @@ foreach tw [$db query {
 			"ITV3" { set mux "COM4/SDN" }
 			"Dave" { set mux "COM5/ARQ A" }
 			"Film4" { set mux "COM6/ARQ B" }
+			"Movies4Men" { set mux "Local" }
 		}
 	}
 	puts "<td>$mux</td>"
--- a/var/mongoose/cgi-bin/db.jim
+++ b/var/mongoose/cgi-bin/db.jim
@@ -8,13 +8,8 @@ require altrow
 puts "Content-Type: text/html"
 puts ""

-set databases {
-	/var/lib/humaxtv/rsvp.db
-	/var/lib/humaxtv/rsv.db
-	/var/lib/humaxtv/setup.db
-	/var/lib/humaxtv/channel.db
-	/mnt/hd2/dms_cds.db
-}
+set databases [glob /var/lib/humaxtv/*.db]
+lappend databases "/mnt/hd2/dms_cds.db"

 header

--- a/var/mongoose/cgi-bin/epg/dump.jim
+++ b/var/mongoose/cgi-bin/epg/dump.jim
--- a/var/mongoose/cgi-bin/epg/info.jim
+++ b/var/mongoose/cgi-bin/epg/info.jim
@@ -18,18 +18,6 @@ set record [lindex [epg fetch dump -service $service -event $event] 0]
 $record get_channel_info
 set others [$record othertimes]

-puts {
-	<style type=text/css>
-	font.also
-	{
-		font-size: 0.9em;
-		font-style: italic;
-		color: #333;
-		background: transparent;
-	}
-	</style>
-}
-
 puts "
 	<table class=keyval>
 	<tr>
@@ -91,7 +79,7 @@ if {[$record get event_crid] != ""} {
 	puts "
 	<tr>
 		<th>CRID</th><td>
-		<a href=/cgi-bin/epg_search.jim?crid=[$record get event_crid]>
+		<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]
@@ -105,7 +93,7 @@ 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]>
+		<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]
@@ -119,7 +107,7 @@ 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]>
+			<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]
@@ -138,7 +126,7 @@ puts "
 	</tr>
 	</table>

-	<a class=footnote href=/cgi-bin/epg_dump.jim?service=[$record get service_id]&event=[$record get event_id]&raw=1>
+	<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>
--- a/var/mongoose/cgi-bin/epg/schedule.jim
+++ b/var/mongoose/cgi-bin/epg/schedule.jim
--- a/var/mongoose/cgi-bin/epg/search.jim
+++ b/var/mongoose/cgi-bin/epg/search.jim
@@ -108,7 +108,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=/cgi-bin/epg/service.jim?service=[$record get service_id]>
 	    [$record get channel_name]
 	    </a></td>"
 	puts [$record cell]
--- a/var/mongoose/cgi-bin/epg/service.jim
+++ b/var/mongoose/cgi-bin/epg/service.jim
--- a/var/mongoose/cgi-bin/pkg.jim
+++ b/var/mongoose/cgi-bin/pkg.jim
@@ -79,7 +79,8 @@ if {[llength $pkgs] > 0} {
 	"

 	foreach pkg $pkgs {
-		if {$filter && ![dict exists $::pkgmeta $pkg]} { continue }
+		if {$type ne "upgr" && $filter && \
+		    ![dict exists $::pkgmeta $pkg]} { continue }
 		pkgrow [pkg load $pkg]
 	}
 	puts "</table>"
@@ -90,7 +91,7 @@ if {[llength $pkgs] > 0} {
 	puts "<i>No packages "
 	switch $type {
 		inst { puts "are installed." }
-		upgr { puts "are available for upgrade." }
+		upgr { puts "are available for upgrade; try updating the package list from the Internet using the button above." }
 		avail { puts "are available for installation." }
 	}
 	puts "</i>"
--- a/var/mongoose/cgi-bin/restart.jim
+++ b/var/mongoose/cgi-bin/restart.jim
@@ -8,6 +8,12 @@ puts "Content-Type: text/html"
 puts ""

 cgi_input
+
+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."
@@ -43,7 +49,7 @@ puts {

 	$(document).ready(function() {
 		$('#progressbar').reportprogress(0);
-		handle = setInterval("update()", 300);
+		handle = setInterval("update()", 350);
 		$.get('/cgi-bin/restart.jim?now=yes');
 	});
 </script>
--- a/var/mongoose/cgi-bin/settings.jim
+++ b/var/mongoose/cgi-bin/settings.jim
@@ -11,6 +11,17 @@ puts ""
 cgi_input
 #cgi_dump

+if {[cgi_get act] eq "https"} {
+	if {[cgi_get val off] eq "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
+}
+
 set settings [settings new]

 set hostname [$settings hostname]
@@ -53,9 +64,6 @@ 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_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"

 set acluser [cgi_get acluser "-"]
@@ -89,6 +97,7 @@ if {$aclact ne "-" && $acluser ne "-"} {
 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/jconfirmaction.jquery.js"></script>
 <link href=/css/jconfirmaction.jquery.css rel=stylesheet type=text/css />
@@ -96,26 +105,6 @@ puts {
 <link href=/css/iphone-style-checkboxes.css rel=stylesheet type=text/css />
 }

-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 "
 	<fieldset style=\"display: inline\">
 		<legend>
@@ -140,6 +129,17 @@ puts "
 	</tr>
 "

+puts -nonewline "
+	<tr>
+		<th class=key>HTTPS web server?</th>
+		<td><input id=https_toggle name=https type=checkbox value=yes"
+if {[file exists /mod/etc/mongoose.cert]} { puts -nonewline " checked" }
+puts ">
+		    <div id=https_output></div>
+		</td>
+	</tr>
+"
+
 puts "
 	<tr>
 	<form class=auto id=epg_style method=get action=$env(REQUEST_URI)>
@@ -315,57 +315,25 @@ $('button.pwchange').click(function(el) {
 </script>
 }

-puts "
+puts -nonewline "
 	<br><br>
 	<fieldset style=\"display: inline\">
 	<legend> Advanced Settings </legend>
 	<table>
-"
-
-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
+		<td><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>
+if {$pkgdev} { puts -nonewline " checked" }
+puts ">
 		</td>
-	</form>
 	</tr>
-}
-
-puts "
 	</table>
+	<div id=pkgdev_output></div>
 	</fieldset>
 "

 eval_plugins settings

-puts {
-<br><br>
-<fieldset style="display: inline">
-<legend> Reset Custom Firmware </legend>
-<button id=cfwreset>
-Click to remove all packages and settings installed by the custom firmware.
-</button>
-</fieldset>
-<script type=text/javascript>
-$('#cfwreset').jConfirmAction({
-	yesAnswer: "Delete"
-}, function(el) {
-	$('html').html('Restart the Humax using the remote control.');
-	$.get('/cgi-bin/cfwreset');
-});
-</script>
-
-}
-
 footer

--- a/var/mongoose/cgi-bin/settings.js
+++ b/var/mongoose/cgi-bin/settings.js
@@ -0,0 +1,77 @@
+(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();
+	$(":checkbox").iphoneStyle();
+	$('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');
+			}
+		});
+	});
+
+	$('#pkgdev').change(function() {
+		var arg = '0';
+		if ($(this).attr('checked'))
+			arg = '1';
+
+		$(this).disable();
+
+		$('#pkgdev_output')
+		    .empty()
+		    .show('slow')
+		    .load('/cgi-bin/settings.jim?pkgdev=' + arg,
+		        function() {
+				$('#pkgdev').enable();
+				$('#pkgdev_output')
+				    .css('font-style', 'italic')
+				    .delay(2000).fadeOut('slow');
+		    });
+	});
+
+	$('#https_toggle').change(function() {
+		var arg = 'off';
+		if ($(this).attr('checked'))
+			arg = 'on';
+
+		$(this).disable();
+
+		$('#https_output')
+		    .empty()
+		    .html('<img src=/img/loading.gif>Please Wait...')
+		    .show('slow')
+		    .load('/cgi-bin/settings.jim?act=https&val=' + arg,
+		        function() {
+				$('#https_toggle').enable();
+				$('#https_output')
+				    .css('font-style', 'italic')
+				    .delay(2000).fadeOut('slow');
+		    });
+	});
+});
+
--- a/var/mongoose/cgi-bin/status.jim
+++ b/var/mongoose/cgi-bin/status.jim
@@ -1,49 +1,95 @@
 #!/mod/bin/jimsh

+source /mod/var/mongoose/lib/setup
+require system.class findhsvc epg.class
+
 puts "Content-Type: text/html"
 puts ""

-if {[catch {set pid [exec pgrep humaxtv]}]} { exit }
-
-if {[catch {set data [exec lsof -p $pid | grep Video | fgrep .ts]} ]} {
-        exit
+if {[catch {set pid [exec pgrep 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 data [exec lsof -p $pid | grep Video | fgrep .ts]
-regsub -all -- {[[:space:]]+} $line " " line
-set lines [split $data "\n"]
-foreach line $lines {
-	regsub -all -- {[[:space:]]+} $line " " line
-	set fields [split $line " "]
-	set name [lindex [split $line "/"] end]
-	set size2 [lindex $fields 6]
-
-	if { $size2 > $size($name) && $seen($name) < 1 } {
-		set mode "Recording"
-		set icon "745_1_11_Video_1REC.png"
+	set ret {}
+	if {[catch {set data \
+	    [exec /mod/bin/lsof -p $pid | grep Video | fgrep .ts]} ]} {
+		set ret {}
 	} else {
-		set mode "Watching"
-		set icon "745_1_10_Video_2Live.png"
+		foreach line [split $data "\n"] {
+			regsub -all -- {[[:space:]]+} $line " " line
+			set name [file rootname [file tail $line]]
+			set size [lindex [split $line " "] 6]
+			set ret($name) $size
+		}
 	}
+	return $ret
+}

-	incr seen($name)
+set play 0
+set rec 0
+set seen {}

-	lappend output "<img class=va src=/images/$icon><span class=va>
-	    $mode&nbsp;$name</span><br>"
+set data [get_data]
+if {[llength $data]} {
+	sleep 2
+	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 {$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)
+
+		lappend output "<img class=va src=/images/$icon><span class=va>
+		    $mode&nbsp;$name</span>"
+	}
+}
+
+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]%\]"
+		}
+			
+		lappend output "[epg channelicon $name 30 \
+		    {vertical-align: middle; padding: 0 4px 0 2px}]
+		    <span class=va> Watching $lcn: $name $prog</span>"
+	}
 }

 if {[llength $output]} {
-	puts [join $output " "]
+	puts [join $output "<br>"]
 }

--- a/var/mongoose/cgi-bin/xepg.jim
+++ b/var/mongoose/cgi-bin/xepg.jim
@@ -98,7 +98,7 @@ foreach e $records {

 		puts "[$e channel_icon 30]&nbsp;"
 		puts "$chnum
-	    <a href=/cgi-bin/epg_service.jim?service=[$e get service_id]
+	    <a href=/cgi-bin/epg/service.jim?service=[$e get service_id]
 		title=\"[$e get channel_name]\">
 	    [$e get channel_name]
 	    </a></div>"
--- a/var/mongoose/html/css/jquery.bar.css
+++ b/var/mongoose/html/css/jquery.bar.css
@@ -0,0 +1,48 @@
+.jbar{
+	height:50px;
+	width:100%;
+	background-color: #ffffcc;
+	color: #ff4000;
+	position:fixed;
+	filter:progid:DXImageTransform.Microsoft.Alpha(opacity=95); 
+	opacity: 0.95;
+	-moz-opacity: 0.95;
+	text-align:center;
+	left:0px;
+	z-index:9999999;
+	margin:0px;
+	padding:0px;
+}
+.jbar-top{
+	top:0px;
+	border-top:2px solid #fff;
+	border-bottom: 1px solid #ebebeb;
+}
+.jbar-bottom{
+	bottom:0px;
+	border-bottom:2px solid #fff;
+	border-top: 1px solid #ebebeb;
+	color:#777;
+}
+.jbar-content{
+	line-height:46px;
+	font-size: 18px;
+	font-family:'Lucida Grande',sans-serif;
+}
+a.jbar-cross{
+	position:absolute;
+	width:31px;
+	height:31px;
+	background:transparent url(/images/cross.png) no-repeat top left;	
+	cursor:pointer;
+	right:10px;
+}
+a.jbar-cross:hover{
+	background-image: url(/images/cross_hover.png)
+}
+.jbar-top a.jbar-cross{
+	top:8px;	
+}
+.jbar-bottom a.jbar-cross{
+	bottom:8px;
+}
--- a/var/mongoose/html/css/jquery.progressbar.css
+++ b/var/mongoose/html/css/jquery.progressbar.css
@@ -1,6 +1,6 @@

 /* progress bar container */
-#progressbar{
+.progressbar, #progressbar{
 	border:1px solid black;
 	width:200px;
 	height:20px;
@@ -8,7 +8,7 @@
 	color:black; 
 }
 /* color bar */
-#progressbar div.progress{
+.progressbar div.progress,#progressbar div.progress{
 	position:absolute;
 	width:0;
 	height:100%;
@@ -16,13 +16,13 @@
 	background-color:#369;
 }
 /* text on bar */
-#progressbar div.progress .text{
+.progressbar div.progress .text,#progressbar div.progress .text{
 	position:absolute;
 	text-align:center;
 	color:white;
 }
 /* text off bar */
-#progressbar div.text{
+.progressbar div.text,#progressbar div.text{
 	position:absolute;
 	width:100%;
 	height:100%;
--- a/var/mongoose/html/css/jqueryFileTree.css
+++ b/var/mongoose/html/css/jqueryFileTree.css
@@ -0,0 +1,91 @@
+UL.jqueryFileTree {
+	font-family: Verdana, sans-serif;
+	font-size: 11px;
+	line-height: 18px;
+	padding: 0px;
+	margin: 0px;
+}
+
+UL.jqueryFileTree LI {
+	list-style: none;
+	padding: 0px;
+	padding-left: 20px;
+	margin: 0px;
+	white-space: nowrap;
+}
+
+UL.jqueryFileTree A {
+	color: #333;
+	text-decoration: none;
+	display: block;
+	padding: 0px 2px;
+}
+
+UL.jqueryFileTree A:hover {
+	background: #BDF;
+}
+
+/* Core Styles */
+.jqueryFileTree LI.directory { background: url(/img/filetree/directory.png) left top no-repeat; }
+.jqueryFileTree LI.expanded { background: url(/img/filetree/folder_open.png) left top no-repeat; }
+.jqueryFileTree LI.file { background: url(/img/filetree/file.png) left top no-repeat; }
+.jqueryFileTree LI.wait { background: url(/img/filetree/spinner.gif) left top no-repeat; }
+/* File Extensions*/
+.jqueryFileTree LI.ext_3gp { background: url(/img/filetree/film.png) left top no-repeat; }
+.jqueryFileTree LI.ext_afp { background: url(/img/filetree/code.png) left top no-repeat; }
+.jqueryFileTree LI.ext_afpa { background: url(/img/filetree/code.png) left top no-repeat; }
+.jqueryFileTree LI.ext_asp { background: url(/img/filetree/code.png) left top no-repeat; }
+.jqueryFileTree LI.ext_aspx { background: url(/img/filetree/code.png) left top no-repeat; }
+.jqueryFileTree LI.ext_avi { background: url(/img/filetree/film.png) left top no-repeat; }
+.jqueryFileTree LI.ext_bat { background: url(/img/filetree/application.png) left top no-repeat; }
+.jqueryFileTree LI.ext_bmp { background: url(/img/filetree/picture.png) left top no-repeat; }
+.jqueryFileTree LI.ext_c { background: url(/img/filetree/code.png) left top no-repeat; }
+.jqueryFileTree LI.ext_cfm { background: url(/img/filetree/code.png) left top no-repeat; }
+.jqueryFileTree LI.ext_cgi { background: url(/img/filetree/code.png) left top no-repeat; }
+.jqueryFileTree LI.ext_com { background: url(/img/filetree/application.png) left top no-repeat; }
+.jqueryFileTree LI.ext_cpp { background: url(/img/filetree/code.png) left top no-repeat; }
+.jqueryFileTree LI.ext_css { background: url(/img/filetree/css.png) left top no-repeat; }
+.jqueryFileTree LI.ext_doc { background: url(/img/filetree/doc.png) left top no-repeat; }
+.jqueryFileTree LI.ext_exe { background: url(/img/filetree/application.png) left top no-repeat; }
+.jqueryFileTree LI.ext_gif { background: url(/img/filetree/picture.png) left top no-repeat; }
+.jqueryFileTree LI.ext_fla { background: url(/img/filetree/flash.png) left top no-repeat; }
+.jqueryFileTree LI.ext_h { background: url(/img/filetree/code.png) left top no-repeat; }
+.jqueryFileTree LI.ext_htm { background: url(/img/filetree/html.png) left top no-repeat; }
+.jqueryFileTree LI.ext_html { background: url(/img/filetree/html.png) left top no-repeat; }
+.jqueryFileTree LI.ext_jar { background: url(/img/filetree/java.png) left top no-repeat; }
+.jqueryFileTree LI.ext_jpg { background: url(/img/filetree/picture.png) left top no-repeat; }
+.jqueryFileTree LI.ext_jpeg { background: url(/img/filetree/picture.png) left top no-repeat; }
+.jqueryFileTree LI.ext_js { background: url(/img/filetree/script.png) left top no-repeat; }
+.jqueryFileTree LI.ext_lasso { background: url(/img/filetree/code.png) left top no-repeat; }
+.jqueryFileTree LI.ext_log { background: url(/img/filetree/txt.png) left top no-repeat; }
+.jqueryFileTree LI.ext_m4p { background: url(/img/filetree/music.png) left top no-repeat; }
+.jqueryFileTree LI.ext_mov { background: url(/img/filetree/film.png) left top no-repeat; }
+.jqueryFileTree LI.ext_mp3 { background: url(/img/filetree/music.png) left top no-repeat; }
+.jqueryFileTree LI.ext_mp4 { background: url(/img/filetree/film.png) left top no-repeat; }
+.jqueryFileTree LI.ext_mpg { background: url(/img/filetree/film.png) left top no-repeat; }
+.jqueryFileTree LI.ext_mpeg { background: url(/img/filetree/film.png) left top no-repeat; }
+.jqueryFileTree LI.ext_ogg { background: url(/img/filetree/music.png) left top no-repeat; }
+.jqueryFileTree LI.ext_pcx { background: url(/img/filetree/picture.png) left top no-repeat; }
+.jqueryFileTree LI.ext_pdf { background: url(/img/filetree/pdf.png) left top no-repeat; }
+.jqueryFileTree LI.ext_php { background: url(/img/filetree/php.png) left top no-repeat; }
+.jqueryFileTree LI.ext_png { background: url(/img/filetree/picture.png) left top no-repeat; }
+.jqueryFileTree LI.ext_ppt { background: url(/img/filetree/ppt.png) left top no-repeat; }
+.jqueryFileTree LI.ext_psd { background: url(/img/filetree/psd.png) left top no-repeat; }
+.jqueryFileTree LI.ext_pl { background: url(/img/filetree/script.png) left top no-repeat; }
+.jqueryFileTree LI.ext_py { background: url(/img/filetree/script.png) left top no-repeat; }
+.jqueryFileTree LI.ext_rb { background: url(/img/filetree/ruby.png) left top no-repeat; }
+.jqueryFileTree LI.ext_rbx { background: url(/img/filetree/ruby.png) left top no-repeat; }
+.jqueryFileTree LI.ext_rhtml { background: url(/img/filetree/ruby.png) left top no-repeat; }
+.jqueryFileTree LI.ext_rpm { background: url(/img/filetree/linux.png) left top no-repeat; }
+.jqueryFileTree LI.ext_ruby { background: url(/img/filetree/ruby.png) left top no-repeat; }
+.jqueryFileTree LI.ext_sql { background: url(/img/filetree/db.png) left top no-repeat; }
+.jqueryFileTree LI.ext_swf { background: url(/img/filetree/flash.png) left top no-repeat; }
+.jqueryFileTree LI.ext_tif { background: url(/img/filetree/picture.png) left top no-repeat; }
+.jqueryFileTree LI.ext_tiff { background: url(/img/filetree/picture.png) left top no-repeat; }
+.jqueryFileTree LI.ext_txt { background: url(/img/filetree/txt.png) left top no-repeat; }
+.jqueryFileTree LI.ext_vb { background: url(/img/filetree/code.png) left top no-repeat; }
+.jqueryFileTree LI.ext_wav { background: url(/img/filetree/music.png) left top no-repeat; }
+.jqueryFileTree LI.ext_wmv { background: url(/img/filetree/film.png) left top no-repeat; }
+.jqueryFileTree LI.ext_xls { background: url(/img/filetree/xls.png) left top no-repeat; }
+.jqueryFileTree LI.ext_xml { background: url(/img/filetree/code.png) left top no-repeat; }
+.jqueryFileTree LI.ext_zip { background: url(/img/filetree/zip.png) left top no-repeat; }
--- a/var/mongoose/html/css/style.css
+++ b/var/mongoose/html/css/style.css
@@ -13,6 +13,19 @@ html>body
 	font-size: small;
 }

+.left, .cleft
+{
+	float: left;
+}
+.cleft
+{
+	clear: left;
+}
+fieldset.left, fieldset.cleft
+{
+	display: inline;
+}
+
 div.container
 {
 	position: relative;
@@ -82,6 +95,12 @@ table.borders, table.borders td, table.borders th
 	color: black;
 }

+.hover
+{
+	background: #f6ff5b;
+	color: black;
+}
+
 table td,table th
 {
 	font-size: small;
@@ -108,7 +127,7 @@ table.keyval td
 	color: black;
 }

-pre, .pre
+pre, .pre, .prelike
 {
        font-family: Consolas, 'Courier New', Courier, monospace;
        color: black;
@@ -126,7 +145,10 @@ pre, .pre
        -webkit-border-top-right-radius: 4px;
        -moz-border-radius-topright: 4px;
        -khtml-border-top-right-radius: 4px;
+}

+pre, .pre
+{
 	white-space: pre-wrap;
 	white-space: -moz-pre-wrap !important;
 	white-space: -pre-wrap;
@@ -296,3 +318,11 @@ div.cut
 	font-size: 12px;
 }

+.also
+{
+	font-size: 0.9em;
+	font-style: italic;
+	color: #333;
+	background: transparent;
+}
+
--- a/var/mongoose/html/css/tsort.css
+++ b/var/mongoose/html/css/tsort.css
@@ -10,6 +10,16 @@ table.tablesorter .header {
 	height: auto;
 }

+table.tablesorter .headerplain {
+	background-image: url(/img/tsort/bgplain.png);
+	background-repeat: no-repeat;
+	border-left: 1px solid #FFF;
+	border-right: 1px solid #000;
+	border-top: 1px solid #FFF;
+	padding-top: 8px;
+	height: auto;
+}
+
 table.tablesorter .headerSortUp {
 	background-image: url(/img/tsort/asc.png);
 	background-repeat: no-repeat;
--- a/var/mongoose/html/css/vlc.css
+++ b/var/mongoose/html/css/vlc.css
@@ -0,0 +1,60 @@
+.x-vlc-slider  {
+    background:#C7F2FF;
+    text-align:center;
+ 
+ }
+ .x-vlc-slider-thumb {
+    background:#4EAECC;
+    width:3px;
+}
+.x-vlc-main {
+ 
+}
+.x-vlc-toolbar {
+
+    color:black;
+
+}
+ .x-vlc-toolbar * {
+      vertical-align:top;
+
+      }
+.x-vlc-btn {
+   
+    padding-right:10px;
+  
+  
+}
+.x-vlc-btn-fullscreen {
+    background:url(/img/vlc/fullscreen2.gif) no-repeat;
+}
+ .x-vlc-btn-plus {
+    background:url(/img/vlc/plus2.gif) no-repeat;
+}
+.x-vlc-btn-moins {
+    background:url(/img/vlc/moins2.gif) no-repeat;
+}
+.x-vlc-btn:hover {
+    color:red;
+    
+}
+.x-vlc-btn-play {
+    background:url(/img/vlc/play2.gif) no-repeat;
+}
+.x-vlc-btn-stop {
+    background:url(/img/vlc/stop2.gif) no-repeat;
+
+}
+.x-vlc-btn-pause {
+    background:url(/img/vlc/pause2.gif) no-repeat;
+
+}
+.x-vlc-timer {
+    width:100px;
+    font-size:12px;
+    vertical-align:top;
+    text-align:center
+}
+.x-vlc-about {
+    font-size:10px;
+}
--- a/var/mongoose/html/dedup/dedup
+++ b/var/mongoose/html/dedup/dedup
@@ -0,0 +1,77 @@
+#!/mod/bin/jimsh
+
+source /mod/var/mongoose/lib/setup
+require ts.class
+
+source /mod/var/mongoose/html/dedup/normalise.jim
+source /mod/var/mongoose/html/dedup/process.jim
+
+set dirs {}
+
+set doit 0
+foreach arg $argv {
+	if {$arg eq "-yes"} {
+		set doit 1
+	} else {
+		lappend dirs $arg
+	}
+}
+if {![llength $dirs]} { lappend dirs [exec pwd] }
+
+foreach dir $dirs {
+	if {[string index $dir end] eq "/"} {
+		set dir [string range $dir 0 end-1]
+	}
+	puts "\[$dir\]"
+
+	foreach file [readdir $dir] {
+		if {[file extension $file] ne ".hmt"} { continue }
+
+		set file "$dir/$file"
+
+		set base [file tail [file rootname $file]]
+		lassign [dedupprocess $file] stat ts syn fn
+
+		puts -nonewline "$base -> "
+
+		switch $stat {
+		    inuse {
+			puts -nonewline "In Use"
+		    }
+		    dup {
+			puts -nonewline "Duplicate"
+			if {$doit} {
+				set dupdir "$dir/_duplicates"
+				if {![file exists $dupdir]} {
+					file mkdir $dupdir
+				}
+				while {[file exists $dupdir/$fn.hmt]} {
+					append fn "~"
+				}
+				ts renamegroup $file "_duplicates/$fn"
+				puts -nonewline " - Renamed to _duplicates/$fn"
+			}
+		    }
+		    error {
+			puts -nonewline "Cannot process"
+		    }
+		    nothing {
+			puts -nonewline "Nothing to do"
+		    }
+		    preserve {
+			puts -nonewline "Preserving"
+		    }
+		    ok {
+			puts -nonewline $fn
+			if {$doit} {
+				# Dooooo, it.
+				$ts settitle $syn
+				ts renamegroup $file $fn
+				puts -nonewline "Done"
+			}
+		    }
+		}
+		puts ""
+	}
+}
+
--- a/var/mongoose/html/dedup/dedup.jim
+++ b/var/mongoose/html/dedup/dedup.jim
@@ -4,6 +4,9 @@ package require cgi
 source /mod/var/mongoose/lib/setup
 require ts.class pretty_size altrow

+source normalise.jim
+source process.jim
+
 puts "Content-Type: text/html"
 puts ""

@@ -13,10 +16,10 @@ cgi_input
 set dir [cgi_get dir "/media/My Video"]
 set doit [cgi_get doit 0]

-# Strip double slashes
-
 header

+puts "<script type=text/javascript src=script.js></script>"
+
 puts "<fieldset style=\"display: inline\">
 <legend>De-duplicate <span id=dir>$dir</span></legend>
 <table class=borders>
@@ -28,38 +31,25 @@ puts "<fieldset style=\"display: inline\">
 </tr>
 "

-regsub -all -- {\/+} "$dir/*" "/" sdir
-
 set seen {}

-foreach file [lsort [glob -nocomplain "$sdir"]] {
+foreach file [readdir $dir] {
+	set file "$dir/$file"
 	if {[file extension $file] ne ".hmt"} { continue }
-	altrow
-	set ts [ts fetch $file 1]
+
 	set base [file tail [file rootname $file]]
+	lassign [dedupprocess $file] stat ts syn fn
+
+	altrow
 	puts "<td nowrap>$base</td>"
-	set syn [$ts get synopsis]
-	regsub -nocase -all -- {^new series\.* *} $syn "" syn
-	regsub -all -- { *[:].*$} $syn "" syn
-	if {[string length $syn] > 40} {
-		lassign [split $syn "."] v w
-		set syn $v
-		if {[string length $syn] < 6 && [string length $w] < 6} {
-			append syn "_$w"
-		}
-	}
-	if {[string length $syn] < 10} {
-		if {[string match "${syn}*" [$ts get title]]} {
-			set syn [$ts get title]
-		} else {
-			append syn " [$ts get title]"
-		}
-	}
-	regsub -all -- {[\/ &]} $syn "_" fn
 	puts "<td>$fn</td>"
 	puts "<td>$syn</td>"
 	puts "<td>"
-	if {$fn in $seen} {
+	switch $stat {
+	    inuse {
+		puts -nonewline "In Use"
+	    }
+	    dup {
 		puts -nonewline "Duplicate"
 		if {$doit} {
 			set dupdir "$dir/_duplicates"
@@ -70,19 +60,25 @@ foreach file [lsort [glob -nocomplain "$sdir"]] {
 			ts renamegroup $file "_duplicates/$fn"
 			puts -nonewline " - Renamed to _duplicates/$fn"
 		}
-	} elseif {[string length $syn] > 40} {
+	    }
+	    error {
 		puts -nonewline "Cannot process"
-	} elseif {$base eq $fn} {
+	    }
+	    nothing {
 		puts -nonewline "Nothing to do"
-	} elseif {[file exists "$dir/$fn.ts"]} {
+	    }
+	    preserve {
 		puts -nonewline "Preserving"
-	} elseif {$doit} {
-		# Dooooo, it.
-		$ts settitle $syn
-		ts renamegroup $file $fn
-		puts -nonewline "Done"
+	    }
+	    ok {
+		if {$doit} {
+			# Dooooo, it.
+			$ts settitle $syn
+			ts renamegroup $file $fn
+			puts -nonewline "Done"
+		}
+	    }
 	}
-	lappend seen $fn
 	
 	puts "</td>"
 	puts "</tr>"
@@ -100,25 +96,8 @@ if {!$doit} { puts "<button id=dedup>Process folder</button>" }

 puts {
 </small>
-
 </div>
-
-<script type=text/javascript>
-$('#browse').button().click(function() {
-	window.location = '/cgi-bin/browse.jim?dir=' +
-	    encodeURIComponent($('#dir').text());
-});
 }

-if {!$doit} {
-	puts {
-	$('#dedup').button().click(function() {
-		window.location = window.location + '&doit=1';
-	});
-	}
-}
-
-puts "</script>"
-
 footer

--- a/var/mongoose/html/dedup/normalise.jim
+++ b/var/mongoose/html/dedup/normalise.jim
@@ -0,0 +1,48 @@
+#!/mod/bin/jimsh
+
+set dedup_prefixes {
+	{^new series\.* *}
+	{^cbeebies\.* *}
+	{^cbbc\.* *}
+	{^brand new series *-* *}
+	{^\.+}
+}
+
+proc dedupnormalise {title {reserve ""}} {
+	global dedup_prefixes
+
+	# Strip common prefixes
+	foreach prefix $dedup_prefixes {
+		regsub -nocase -all -- $prefix $title "" title
+	}
+
+	# Strip anything following a colon.
+	regsub -all -- { *[:].*$} $title "" title
+
+	# If the resulting string is longer than 40 characters then
+	# split around . and take the left hand side if appropriate.
+	if {[string length $title] > 40} {
+		lassign [split $title "."] v w
+		set title $v
+		if {[string length $title] < 6 && [string length $w] < 6} {
+			append title "_$w"
+		}
+	}
+
+	# if still short, add the reserve string.
+	if {[string length $title] < 10} {
+		if {[string match "${title}*" $reserve]} {
+			set title $reserve
+		} else {
+			append title " $reserve"
+		}
+	}
+
+	# Shorten if too long.
+	if {[string length $title] > 40} {
+		set title [string range $title 0 39]
+	}
+
+	return $title
+}
+
--- a/var/mongoose/html/dedup/process.jim
+++ b/var/mongoose/html/dedup/process.jim
@@ -0,0 +1,31 @@
+#!/mod/bin/jimsh
+
+require system.class
+
+proc dedupprocess {file} {{seen {}}} {
+	set ts [ts fetch $file 1]
+	set dir [file dirname $file]
+	set base [file tail [file rootname $file]]
+	set syn [dedupnormalise [$ts get synopsis] [$ts get title]]
+	# Escape special characters to create the filename.
+	regsub -all -- {[\/ &]} $syn "_" fn
+	regsub -all -- {[?]} $fn "" fn
+
+	set stat ok
+	if {[system inuse [file rootname $file]]} {
+		set stat inuse
+	} elseif {$fn in $seen} {
+		set stat dup
+	} elseif {[string length $syn] > 40} {
+		set stat error
+	} elseif {$base eq $fn} {
+		set stat nothing
+	} elseif {[file exists "$dir/$fn.ts"]} {
+		set stat preserve
+	}
+
+	lappend seen $fn
+
+	return [list $stat $ts $syn $fn]
+}
+
--- a/var/mongoose/html/dedup/script.js
+++ b/var/mongoose/html/dedup/script.js
@@ -0,0 +1,14 @@
+
+$(function() {
+
+$('#browse').button().click(function() {
+	window.location = '/cgi-bin/browse.jim?dir=' +
+	    encodeURIComponent($('#dir').text());
+});
+
+$('#dedup').button().click(function() {
+	window.location = window.location + '&doit=1';
+});
+
+});
+
--- a/var/mongoose/html/diag.shtml
+++ b/var/mongoose/html/diag.shtml
@@ -1,38 +0,0 @@
-<!--#include virtual="/lib/header.shtml" -->
-
-<fieldset style="display: inline; float: left; clear: left">
-<legend>Diagnostics</legend>
-Diagnostic:
-<input name=seq id=seq autocorrect=off autocapitalize=off
-    value=general size=30 maxlength=50
-    class="text ui-widget-content ui-corner-all">
-<button id=rundiag>Run Diagnostic</button>
-</fieldset>
-
-<fieldset style="display: inline; float: left; clear: left">
-<legend>Log Files</legend>
-<!--#exec cmd="/mod/var/mongoose/include/logfiles.jim" -->
-</fieldset>
-
-<div style="margin-top: 2em; display: none; float: left; clear: left"
-class=pre id=results></div>
-
-<script type=text/javascript>
-$('#rundiag').button().click(function() {
-	$('#results')
-	    .slideDown()
-	    .text('\n\nRunning diagnostic, please wait...\n\n')
-	    .load('/cgi-bin/diag.jim?diag=' +
-	    encodeURIComponent($('#seq').val()));
-});
-$('a.log').click(function() {
-	$('#results')
-	    .slideDown()
-	    .text('\n\nLoading log, please wait...\n\n')
-	    .load('/cgi-bin/cat.jim?file=' +
-	    encodeURIComponent($(this).attr('file')));
-});
-</script>
-
-<!--#include virtual="/lib/footer.shtml" -->
-
--- a/var/mongoose/html/diag/diag.jim
+++ b/var/mongoose/html/diag/diag.jim
@@ -0,0 +1,139 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require pretty_size
+
+puts "Content-Type: text/html"
+puts ""
+
+header
+
+puts {
+<script type=text/javascript src=/js/enadis.js></script>
+<script type=text/javascript src=script.js></script>
+
+<fieldset class=cleft>
+<legend>Utilities</legend>
+<table>
+
+<tr>
+<td>Run Diagnostic:</td>
+<td><input name=seq id=seq autocorrect=off autocapitalize=off
+    value=general size=30 maxlength=50
+    class="text ui-widget-content ui-corner-all">
+<button id=rundiag>Run Diagnostic</button>
+</td>
+</tr>
+
+<tr>
+<td>Package:</td>
+<td><input name=fopkg id=fopkg autocorrect=off autocapitalize=off
+    value='' size=30 maxlength=50
+    class="text ui-widget-content ui-corner-all">
+<button id=runfopkg>Force re-install</button>
+</td>
+</tr>
+
+<tr><td colspan=2 style="height: 10px"></td></tr>
+
+<tr>
+<td colspan=2 align=center>
+<button id=runedit style="width: 48%">File Editor</button>
+<button id=dbinfo style="width: 48%">Database Browser</button>
+</td>
+</tr>
+
+<tr>
+<td colspan=2 align=center>
+<button id=channelinfo style="width: 48%">Channel Information</button>
+</td>
+</tr>
+
+}
+
+if {[system model] eq "HDR"} {
+puts {
+<tr>
+<td colspan=2 align=center>
+<button id=dlna style="width: 48%">DLNA Server</button>
+</td>
+</tr>
+}
+}
+
+puts {
+
+<tr><td colspan=2 style="height: 10px"></td></tr>
+
+<tr>
+<td colspan=2>
+<button id=reboot style="width: 100%">Reboot System</button>
+</td>
+</tr>
+
+<tr>
+<td colspan=2>
+<button id=runreset style="width: 100%"
+}
+
+if {[system modversion 1] < 200} {
+	puts -nonewline " disabled class=ui-state-disabled"
+}
+
+puts {
+>
+Remove all custom firmware packages and settings 
+</button>
+}
+
+if {[system modversion 1] < 200} {
+	puts {
+<div class=footnote style="text-align: center">
+(Install custom firmware v2.00 to enable this option)
+</div>
+	}
+}
+
+puts {
+
+<div id=resetdone class="hidden blood">
+Restart your Humax with the remote control.<br>
+Allow it to turn off completely before restarting.<br>
+</div>
+
+</td>
+</tr>
+
+</table>
+<span class=also style="padding-left: 5px">
+View:
+<a href=/jim/ref.html target=_blank>Jim Reference Manual</a> |
+<a href=/jim/oo.html target=_blank>OO</a> |
+<a href=/jim/sqlite.html target=_blank>Sqlite</a>
+</span>
+</fieldset>
+
+<fieldset class=left>
+<legend>View Log Files</legend>
+}
+
+foreach file [lsort [concat \
+    [glob -nocomplain /var/log/*.log] \
+    [glob -nocomplain /mod/tmp/*.log] \
+]] {
+	puts "<a href=# class=log file=\"$file\">
+	    <img border=0 height=14 src=/images/421_1_00_CH_Title_2R_Arrow.png>
+	    [file tail $file]</a> ([pretty_size [file size $file]]) <br>"
+}
+
+puts {
+</fieldset>
+
+<div style="margin-top: 2em; display: none; float: left; clear: left"
+    id=results></div>
+
+}
+
+footer
+
--- a/var/mongoose/html/diag/rundiag.jim
+++ b/var/mongoose/html/diag/rundiag.jim
--- a/var/mongoose/html/diag/script.js
+++ b/var/mongoose/html/diag/script.js
@@ -0,0 +1,83 @@
+
+$(function() {
+
+$('button').button();
+
+$('#rundiag').click(function() {
+	$('#results')
+	    .slideDown()
+	    .text('\n\nRunning diagnostic, please wait...\n\n')
+	    .load('rundiag.jim?diag=' +
+	    encodeURIComponent($('#seq').val()), function() {
+		$('#results').wrapInner('<pre>');
+	    });
+});
+
+$('#runfopkg').click(function() {
+	$('#results')
+	    .slideDown()
+	    .text('\n\nForcibly re-installing package, please wait...\n\n')
+	    .load('/cgi-bin/opkg.jim?cmd=install+--force-reinstall+' +
+	    encodeURIComponent($('#fopkg').val()), function() {
+		$('#results').wrapInner('<pre>');
+		$('#fopkg').val('');
+	    });
+});
+
+$('a.log').click(function() {
+	$('#results')
+	    .slideDown()
+	    .text('\n\nLoading log, please wait...\n\n')
+	    .load('/cgi-bin/cat.jim?file=' +
+	        encodeURIComponent($(this).attr('file')), function() {
+	    		$('#results').wrapInner('<pre>');
+		});
+});
+
+$('#runedit').click(function(e) {
+	e.preventDefault();
+	window.location = '/edit/edit.jim';
+});
+
+$('#dbinfo').click(function(e) {
+	e.preventDefault();
+	window.location = '/cgi-bin/db.jim';
+});
+
+$('#channelinfo').click(function(e) {
+	e.preventDefault();
+	window.location = '/cgi-bin/channel.jim';
+});
+
+$('#dlna').click(function(e) {
+	e.preventDefault();
+	window.location = '/dlna/dlna.jim';
+});
+
+$('#reboot').click(function(e) {
+	e.preventDefault();
+	if (confirm('Are you sure you wish to perform a reboot now?'))
+	    if (confirm('Really sure?\n\nThere is a small chance the ' +
+		' Humax may not restart\n' +
+		'without physical intervention.\n\n' +
+		'i.e. pressing the standby button or using the remote control'))
+			window.location = '/cgi-bin/restart.jim';
+});
+
+$('#runreset').click(function(e) {
+	e.preventDefault();
+	if (!confirm('Are you sure? This will completely remove all packages and settings.'))
+		return;
+	if (!confirm('Are you really sure?'))
+		return;
+	if (!confirm('One last time, are you sure?'))
+		return;
+	$.get('/cgi-bin/cfwreset.cgi', function() {
+		$('button').disable();
+		$('#resetdone').slideDown();
+	});
+});
+
+});
+
+
--- a/var/mongoose/html/dlna/dlna.jim
+++ b/var/mongoose/html/dlna/dlna.jim
@@ -0,0 +1,84 @@
+#!/mod/bin/jimsh
+
+package require cgi
+package require sqlite3
+source /mod/var/mongoose/lib/setup
+require ts.class pretty_size
+
+puts "Content-Type: text/html\r\n\r\n"
+
+cgi_input
+#cgi_dump
+
+header
+
+#append dmsfile ".rr"
+
+set vars {
+	object.container 0
+	object.item.videoItem.movie 0
+	object.item.imageItem.photo 0
+	object.item.audioItem.musicTrack 0
+}
+
+if {[file exists $dmsfile] && ![catch {set db [sqlite3.open $dmsfile]}]} {
+	catch {
+		foreach ret [$db query "
+			select class, count(*) from tblObject group by 1
+		"] {
+			lassign $ret x class x num
+			set vars($class) $num
+		}
+	}
+	$db close
+}
+
+if {[system param DMS_START_ON]} {
+	set cfgstat "Enabled"
+} else {
+	set cfgstat "Disabled"
+}
+
+if {[system is_listening 9000]} {
+	set stat "Running."
+	set img "745_1_10_Video_2Live.png"
+} else {
+	set stat "Not running."
+	set img "745_1_11_Video_1REC.png"
+}
+
+puts "
+<script type=text/javascript src=script.js></script>
+<fieldset class=cleft>
+<legend>DLNA Server Information</legend>
+
+<table class=keyval cellpadding=5>
+<tr>
+	<th>Server Status</th>
+	<td class=va>$cfgstat - <img class=va src=/images/$img> $stat</td>
+</tr><tr>
+	<th>Folders Indexed</th>
+	<td>$vars(object.container)</td>
+</tr><tr>
+	<th>Movies Indexed</th>
+	<td>$vars(object.item.videoItem.movie)</td>
+</tr><tr>
+	<th>Photos Indexed</th>
+	<td>$vars(object.item.imageItem.photo)</td>
+</tr><tr>
+	<th>Music Tracks Indexed</th>
+	<td>$vars(object.item.audioItem.musicTrack)</td>
+</tr><tr>
+
+</table>
+</fieldset>
+<div class=cleft style=\"padding-top: 0.5em\">
+<button id=dlnareset>Reset DLNA Database</button>
+</div>
+<div id=results class=\"cleft hidden blood\"
+    style=\"border: solid 1px #ccc; margin: 1em; padding: 1em;\">
+</div>
+"
+
+footer
+
--- a/var/mongoose/html/dlna/reset.jim
+++ b/var/mongoose/html/dlna/reset.jim
@@ -0,0 +1,27 @@
+#!/mod/bin/jimsh
+
+source /mod/var/mongoose/lib/setup
+require system.class
+
+puts "Content-Type: text/html"
+puts ""
+
+set menupath "Settings-&gt;System-&gt;Internet Setting-&gt;Content Share"
+set dbpath "/mnt/hd2/dms_cds.db"
+
+if {[system param DMS_START_ON] || [system is_listening 9000]} {
+	puts "To reset the DLNA Database, disable <i>Content Sharing</i>"
+	puts " in the Humax menus at<br>"
+	puts "<span class=also style=\"padding-left: 5em\">$menupath</span><br>"
+	puts "and click the button again."
+} elseif {![file exists $dbpath]} {
+	puts "The DLNA Database does not exist.<br>"
+	puts "(already reset?)"
+} else {
+	file delete $dbpath
+	puts "The DLNA Database has been reset.<br>"
+	puts "You can now re-enable <i>Content Sharing</i> in the Humax menus."
+	puts "<br>"
+	puts "<span class=also style=\"padding-left: 5em\">$menupath</span><br>"
+}
+
--- a/var/mongoose/html/dlna/script.js
+++ b/var/mongoose/html/dlna/script.js
@@ -0,0 +1,11 @@
+$(function() {
+
+$('button').button();
+
+$('#dlnareset').click(function(e) {
+	e.preventDefault();
+	$('#results').empty().slideDown().load('reset.jim');
+});
+
+});
+
--- a/var/mongoose/html/edit/edit.jim
+++ b/var/mongoose/html/edit/edit.jim
@@ -0,0 +1,53 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+
+puts "Content-Type: text/html"
+puts ""
+
+header
+
+cgi_input
+#cgi_dump
+set file [cgi_get file "/tmp/hosts"]
+
+puts {
+<script type=text/javascript src=/js/enadis.js></script>
+<script type=text/javascript src=/js/tabsupport.js></script>
+<script type=text/javascript src=/js/jqueryFileTree.js></script>
+<link rel=stylesheet type=text/css href=/css/jqueryFileTree.css />
+<script type=text/javascript src=script.js></script>
+<link rel=stylesheet href=style.css type=text/css />
+
+<fieldset class=cleft>
+<legend>File Editor</legend>
+
+<div id=msg class=blood style="padding-bottom: 0.7em">
+Use the <i>Open</i> button below to begin.
+</div>
+
+<textarea cols=80 rows=20 id=editor></textarea>
+
+<br>
+<button class=xeditactive id=open>Open</button>
+<button class=editactive id=save>Save</button>
+<button class=editactive id=revert>Revert</button>
+
+<div id=result class="blood hidden" />
+
+</fieldset>
+
+<div class=cleft>
+	<button id=back>Back to diagnostics</button>
+</div>
+
+<div id=chooserd>
+	<i>Humax Filesystem</i>
+	<div id=chooser></div>
+</div>
+
+}
+
+footer
+
--- a/var/mongoose/html/edit/files.jim
+++ b/var/mongoose/html/edit/files.jim
@@ -0,0 +1,43 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+
+cgi_input
+#cgi_dump
+
+puts "Content-Type: text/html"
+puts ""
+
+set root [cgi_get dir]
+
+set files [lsort [readdir -nocomplain $root]]
+
+puts "<ul class=jqueryFileTree class=hidden>"
+
+foreach dir $files {
+	set path "$root/$dir"
+	regsub -all -- {\/+} $path "/" path
+	if {![file isdirectory $path]} continue
+	puts -nonewline "<li class=\"directory collapsed\"><a href=# rel=\""
+	puts -nonewline [cgi_quote_html $path]
+	puts "\">[cgi_quote_html $dir]</a></li>"
+}
+
+foreach file $files {
+	set path "$root/$file"
+	regsub -all -- {\/+} $path "/" path
+	if {[file isdirectory $path]} continue
+	set ext [file extension $file]
+	puts -nonewline "<li class=\"file"
+	if {[string length $ext]} {
+		puts -nonewline " ext_[string range $ext 1 end]"
+	}
+	puts -nonewline "\">"
+	puts -nonewline "<a href=# rel=\"[cgi_quote_html $path]\">"
+	puts -nonewline [cgi_quote_html $file]
+	puts "</a></li>"
+}
+
+puts "</ul>"
+
--- a/var/mongoose/html/edit/get.jim
+++ b/var/mongoose/html/edit/get.jim
@@ -0,0 +1,32 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require chunked pretty_size
+
+cgi_input
+#cgi_dump
+
+set file [cgi_get file "/tmp/hosts"]
+if {$file eq "-"} { exit }
+
+start_chunked "text/plain"
+
+if {![file exists $file]} {
+	chunk ">>> File $file does not exist.\r\n"
+} else {
+	set type [exec /mod/bin/file --brief --mime-type --dereference $file]
+	if {![string match {text/*} $type]} {
+		chunk ">>> File $file is not a plain file ($type)"
+	} elseif {[file size $file] > 102400} {
+		chunk ">>> File $file is too large."
+		chunk ">>>   [pretty_size [file size $file]]"
+	} else {
+		set fp [open $file r]
+		chunk [read $fp]
+		close $fp
+	}
+}
+
+end_chunked
+
--- a/var/mongoose/html/edit/put.jim
+++ b/var/mongoose/html/edit/put.jim
@@ -0,0 +1,23 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+set file [cgi_get file "/tmp/testfile"]
+if {$file eq "-"} { exit }
+set data [cgi_get data]
+
+if {[catch {set fp [open $file w]} msg]} {
+	puts "Error, $msg"
+} else {
+	$fp puts -nonewline $data
+	close $fp
+	puts "File saved."
+}
+
--- a/var/mongoose/html/edit/script.js
+++ b/var/mongoose/html/edit/script.js
@@ -0,0 +1,107 @@
+
+$(function() {
+
+var file = null;
+var changed = false;
+
+$('button').button();
+$('button.editactive').disable();
+$('#editor').tabsupport().disable();
+
+function loadfile(f)
+{
+	if (!f)
+		f = file;
+
+	$('button.editactive').disable();
+	$('#editor').disable().val('');
+	$('#msg').text('Loading ' + f);
+	$.get('get.jim?file=' + encodeURIComponent(f), function(data) {
+		if (data.match('^>>>'))
+		{
+			$('#msg').text(data);
+			file = null;
+			changed = false;
+		}
+		else
+		{
+			$('#editor').val(data).enable();
+			$('button.editactive').enable();
+			$('#msg').html('Editing <i>' + f + '</i>');
+			file = f;
+			changed = false;
+		}
+	});
+}
+
+function result(msg)
+{
+	$('#result')
+	    .html(msg)
+	    .slideDown('slow')
+	    .delay(5000)
+	    .slideUp('slow');
+}
+
+$('#chooser').fileTree({
+	root: '/',
+	script: 'files.jim',
+	multiFolder: false
+}, function(file) {
+	$('#chooserd').dialog('close');
+	loadfile(file);
+});
+
+$('#chooserd').dialog({
+	title: "Choose File to Edit",
+	modal: true, autoOpen: false,
+	height: '500', width: '600',
+	draggable: true, resizable: true,
+	closeOnEscape: true,
+	buttons: {
+		"Cancel" : function() {$(this).dialog('close');}
+	}
+});
+
+$('#open').click(function() {
+	$('#chooserd').dialog('open');
+});
+
+$('#editor').change(function() {
+	changed = true;
+});
+
+$('#save').click(function() {
+	if (!changed)
+	{
+		result('No changes to save.');
+		return;
+	}
+
+	if (!confirm('Save file?'))
+		return;
+	$.post('put.jim', {
+	    'file': file,
+	    'data': $('#editor').val()
+	}, function(data) {
+		result(data);
+	});
+});
+
+$('#revert').click(function() {
+	if (!changed)
+	{
+		result('No changes to revert.');
+		return;
+	}
+	if (!confirm('Discard changes and re-load file?'))
+		return;
+	loadfile();
+});
+
+$('#back').click(function() {
+		window.location = '/diag/diag.jim';
+	});
+
+});
+
--- a/var/mongoose/html/edit/style.css
+++ b/var/mongoose/html/edit/style.css
@@ -0,0 +1,24 @@
+textarea
+{
+	background: white;
+	color: black;
+}
+
+#filename
+{
+	font-style: italic;
+}
+
+.loading
+{
+	font-style: italic;
+	color: #aaa;
+	background: white;
+}
+
+#chooser
+{
+	border: solid 1px #bbb;
+	padding: 5px;
+}
+
--- a/var/mongoose/html/img/Dustbin_Folder.png
+++ b/var/mongoose/html/img/Dustbin_Folder.png
--- a/var/mongoose/html/img/Video_Failed.png
+++ b/var/mongoose/html/img/Video_Failed.png
--- a/var/mongoose/html/img/ar.png
+++ b/var/mongoose/html/img/ar.png
--- a/var/mongoose/html/img/channels/1-2-1
+++ b/var/mongoose/html/img/channels/1-2-1
@@ -1 +0,0 @@
-blank.png
--- a/var/mongoose/html/img/channels/301.png
+++ b/var/mongoose/html/img/channels/301.png
--- a/var/mongoose/html/img/channels/302.png
+++ b/var/mongoose/html/img/channels/302.png
@@ -1 +0,0 @@
-302.png -
--- a/var/mongoose/html/img/channels/303.png
+++ b/var/mongoose/html/img/channels/303.png
@@ -1 +0,0 @@
-303.png -
--- a/var/mongoose/html/img/channels/305.png
+++ b/var/mongoose/html/img/channels/305.png
@@ -1 +0,0 @@
-305.png -
--- a/var/mongoose/html/img/channels/4Music.png
+++ b/var/mongoose/html/img/channels/4Music.png
--- a/var/mongoose/html/img/channels/4music.png
+++ b/var/mongoose/html/img/channels/4music.png
@@ -1 +0,0 @@
-4Music.png
--- a/var/mongoose/html/img/channels/5
+++ b/var/mongoose/html/img/channels/5
--- a/var/mongoose/html/img/channels/5*.png
+++ b/var/mongoose/html/img/channels/5*.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
hummypkg	b45fe08fe2	tweak message git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@928 2a923420-c742-0410-a762-8d5b09965624	2012-04-18 21:19:12 +00:00
hummypkg	a5c65505e4	show current channel, retain more backups git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@927 2a923420-c742-0410-a762-8d5b09965624	2012-04-18 20:26:34 +00:00
hummypkg	6ab9318fa9	update dedup git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@926 2a923420-c742-0410-a762-8d5b09965624	2012-04-14 21:31:25 +00:00
hummypkg	52728ba471	update dedup, require new rsvsync git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@909 2a923420-c742-0410-a762-8d5b09965624	2012-04-11 20:54:59 +00:00
hummypkg	68ae915f57	change folder for events git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@897 2a923420-c742-0410-a762-8d5b09965624	2012-04-10 19:45:49 +00:00
hummypkg	3d0152e475	add dlna stuff git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@894 2a923420-c742-0410-a762-8d5b09965624	2012-04-08 23:26:38 +00:00
hummypkg	87060ef8e2	exclude more directories git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@890 2a923420-c742-0410-a762-8d5b09965624	2012-04-05 21:00:22 +00:00
hummypkg	46dad281f5	test git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@889 2a923420-c742-0410-a762-8d5b09965624	2012-04-05 20:59:08 +00:00
hummypkg	f14b2a8b2e	move icons into separate package git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@888 2a923420-c742-0410-a762-8d5b09965624	2012-04-05 20:39:57 +00:00
hummypkg	79a09e1df6	move links from main page to diag git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@885 2a923420-c742-0410-a762-8d5b09965624	2012-04-05 20:30:40 +00:00
hummypkg	2de66b4f3c	update version git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@880 2a923420-c742-0410-a762-8d5b09965624	2012-03-31 21:30:21 +00:00
hummypkg	2bbf69f820	schedule restructure git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@876 2a923420-c742-0410-a762-8d5b09965624	2012-03-31 21:16:31 +00:00
hummypkg	8fb6570882	fix mpg extraction progress bar git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@863 2a923420-c742-0410-a762-8d5b09965624	2012-03-28 18:59:06 +00:00
hummypkg	df8d655cc8	improvements git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@835 2a923420-c742-0410-a762-8d5b09965624	2012-03-11 00:26:14 +00:00
hummypkg	d8914e2311	enable cfw reset git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@762 2a923420-c742-0410-a762-8d5b09965624	2012-02-23 22:06:39 +00:00
hummypkg	3afef45f86	depend on file git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@759 2a923420-c742-0410-a762-8d5b09965624	2012-02-23 00:25:59 +00:00
hummypkg	4ae2604f0a	checkpoint git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@758 2a923420-c742-0410-a762-8d5b09965624	2012-02-23 00:08:38 +00:00
hummypkg	973a7cdacf	improve diagnostics and file editor git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@755 2a923420-c742-0410-a762-8d5b09965624	2012-02-22 19:09:46 +00:00
hummypkg	aadac18796	add editor git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@753 2a923420-c742-0410-a762-8d5b09965624	2012-02-22 01:14:12 +00:00
hummypkg	955217bdd2	update dependencies and remote reset block git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@748 2a923420-c742-0410-a762-8d5b09965624	2012-02-19 22:38:36 +00:00
hummypkg	1dbd659ddb	add op complete to pkg git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@737 2a923420-c742-0410-a762-8d5b09965624	2012-02-13 21:02:12 +00:00
hummypkg	57515b2941	add mpg, fix diag git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@735 2a923420-c742-0410-a762-8d5b09965624	2012-02-12 23:11:23 +00:00
hummypkg	ef1e7b82e8	version 0.9.2 git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@731 2a923420-c742-0410-a762-8d5b09965624	2012-02-07 22:54:29 +00:00
hummypkg	1a7cb41a16	restructure epg, fix log newlines git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@730 2a923420-c742-0410-a762-8d5b09965624	2012-02-07 22:48:54 +00:00
hummypkg	7a66306f78	label segments with sequence number git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@726 2a923420-c742-0410-a762-8d5b09965624	2012-02-07 00:40:31 +00:00
hummypkg	a014fec23d	move modules to subdirectories and split JS/CSS out git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@725 2a923420-c742-0410-a762-8d5b09965624	2012-02-07 00:17:33 +00:00
hummypkg	d307699ab1	add 45 minute split git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@724 2a923420-c742-0410-a762-8d5b09965624	2012-02-06 23:28:53 +00:00
hummypkg	3f6e8754c6	bug fixes git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@723 2a923420-c742-0410-a762-8d5b09965624	2012-02-05 22:49:27 +00:00
hummypkg	742a56485a	catch more dlna database errors, bump to version 0.9.1 git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@717 2a923420-c742-0410-a762-8d5b09965624	2012-02-05 20:07:49 +00:00
hummypkg	fa9905d8bd	replace glob with readdir in some cases. Move paste button to clipboard git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@711 2a923420-c742-0410-a762-8d5b09965624	2012-02-01 21:02:43 +00:00
hummypkg	a3ecbe1d3f	add system inuse git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@705 2a923420-c742-0410-a762-8d5b09965624	2012-01-30 21:59:18 +00:00
hummypkg	924bc72832	update to 0.9.0-2, fix vlc icons, require fixed jim git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@694 2a923420-c742-0410-a762-8d5b09965624	2012-01-28 11:15:22 +00:00
hummypkg	909605b074	fix deletions from non-mediaroot paths git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@691 2a923420-c742-0410-a762-8d5b09965624	2012-01-27 21:54:39 +00:00
hummypkg	f62904edb4	vlc working + media git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@690 2a923420-c742-0410-a762-8d5b09965624	2012-01-25 23:19:57 +00:00
hummypkg	8d36fe22dd	checkpoint webif git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@687 2a923420-c742-0410-a762-8d5b09965624	2012-01-22 19:47:47 +00:00
hummypkg	2e0d49537d	update jim documentation git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@686 2a923420-c742-0410-a762-8d5b09965624	2012-01-22 19:46:30 +00:00
hummypkg	572e31efcc	only show transmission/mediatomb icons if running, fix pkgdev toggle git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@681 2a923420-c742-0410-a762-8d5b09965624	2012-01-21 01:27:06 +00:00
hummypkg	8ec03f2636	add SSL server support git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@679 2a923420-c742-0410-a762-8d5b09965624	2012-01-19 21:15:52 +00:00
hummypkg	95bef6f458	add network name git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@678 2a923420-c742-0410-a762-8d5b09965624	2012-01-18 22:15:20 +00:00
hummypkg	44038eb7a1	fix another size issue git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@677 2a923420-c742-0410-a762-8d5b09965624	2012-01-18 00:07:25 +00:00
hummypkg	ae607a6071	hover over synopsis, fix sizes, fix delete git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@676 2a923420-c742-0410-a762-8d5b09965624	2012-01-18 00:02:55 +00:00
hummypkg	c5de79b214	Streamline deletion. Touch files into dustbin. git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@674 2a923420-c742-0410-a762-8d5b09965624	2012-01-16 22:28:20 +00:00
hummypkg	fa839705fc	rename default bin git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@672 2a923420-c742-0410-a762-8d5b09965624	2012-01-14 23:08:54 +00:00
hummypkg	3d75b93f1a	allow deletions from inside dustbin git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@666 2a923420-c742-0410-a762-8d5b09965624	2012-01-14 00:29:44 +00:00
hummypkg	602f96e1ac	support variable dustbin name git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@663 2a923420-c742-0410-a762-8d5b09965624	2012-01-14 00:12:07 +00:00
hummypkg	3312a76cc6	dynamic dustbin git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@661 2a923420-c742-0410-a762-8d5b09965624	2012-01-13 23:28:48 +00:00
hummypkg	88026872d9	add dustbin folder image git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@658 2a923420-c742-0410-a762-8d5b09965624	2012-01-13 21:34:24 +00:00
hummypkg	ce2dfa8338	update delete system git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@657 2a923420-c742-0410-a762-8d5b09965624	2012-01-13 21:23:03 +00:00
hummypkg	6e2a0f3e2b	dustbin support + bugfix git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@648 2a923420-c742-0410-a762-8d5b09965624	2012-01-10 19:51:45 +00:00
hummypkg	ccb513be49	0.8.11 git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@639 2a923420-c742-0410-a762-8d5b09965624	2012-01-08 21:10:38 +00:00
hummypkg	84b5cb9506	reinstate delete, add failed recordings git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@638 2a923420-c742-0410-a762-8d5b09965624	2012-01-08 20:54:07 +00:00
hummypkg	337a2add7a	verson 0.8.10 git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@636 2a923420-c742-0410-a762-8d5b09965624	2012-01-07 22:30:41 +00:00
hummypkg	4706fe6bcd	disable delete git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@635 2a923420-c742-0410-a762-8d5b09965624	2012-01-07 22:30:19 +00:00
hummypkg	88d78a7d42	more verbose message git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@634 2a923420-c742-0410-a762-8d5b09965624	2012-01-06 23:57:31 +00:00
hummypkg	b442fef333	upgradable packages come first git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@632 2a923420-c742-0410-a762-8d5b09965624	2012-01-06 23:44:55 +00:00
hummypkg	f771f55017	fix pkg upgrade tab git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@631 2a923420-c742-0410-a762-8d5b09965624	2012-01-06 23:39:15 +00:00
hummypkg	267ba4fade	fix avail git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@630 2a923420-c742-0410-a762-8d5b09965624	2012-01-06 23:27:35 +00:00
hummypkg	c2ec779465	allow restart cancel, improve logfile list git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@629 2a923420-c742-0410-a762-8d5b09965624	2012-01-05 22:42:45 +00:00
hummypkg	75b31696c5	dynamic databases git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@600 2a923420-c742-0410-a762-8d5b09965624	2012-01-03 12:12:07 +00:00
hummypkg	f54d162298	update to 0.8.9 git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@594 2a923420-c742-0410-a762-8d5b09965624	2011-12-29 01:17:55 +00:00
hummypkg	2a0bcbc81e	minor tweaks for IE9 git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@593 2a923420-c742-0410-a762-8d5b09965624	2011-12-29 01:17:32 +00:00
hummypkg	4d3183ea61	working copy/paste git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@592 2a923420-c742-0410-a762-8d5b09965624	2011-12-29 00:57:18 +00:00
hummypkg	7c038a1776	checkpoint git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@588 2a923420-c742-0410-a762-8d5b09965624	2011-12-28 21:36:35 +00:00
hummypkg	822de81971	checkpoint - working on clipboard git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@587 2a923420-c742-0410-a762-8d5b09965624	2011-12-28 14:11:10 +00:00
hummypkg	09e71400a2	updates git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@585 2a923420-c742-0410-a762-8d5b09965624	2011-12-27 18:43:40 +00:00
hummypkg	18cafc8c39	handle ar/pad icons git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@576 2a923420-c742-0410-a762-8d5b09965624	2011-12-19 22:52:17 +00:00
hummypkg	593b7dbb89	fix bugs, show AR/Pad status git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@572 2a923420-c742-0410-a762-8d5b09965624	2011-12-19 15:57:03 +00:00
hummypkg	de47e46fe7	fix scheduling problem git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@566 2a923420-c742-0410-a762-8d5b09965624	2011-12-18 21:17:03 +00:00
hummypkg	509c98ee74	update git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@564 2a923420-c742-0410-a762-8d5b09965624	2011-12-14 13:55:58 +00:00
hummypkg	ddb63e68b7	7 days, not 7 hours git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@562 2a923420-c742-0410-a762-8d5b09965624	2011-12-13 22:55:42 +00:00
hummypkg	5de2ba1c37	fix bug git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@561 2a923420-c742-0410-a762-8d5b09965624	2011-12-13 21:00:27 +00:00
hummypkg	43f6281410	add flatten support git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@560 2a923420-c742-0410-a762-8d5b09965624	2011-12-12 23:45:58 +00:00
hummypkg	8166af0f1b	fix IE error, fix typo in anacrontab git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@559 2a923420-c742-0410-a762-8d5b09965624	2011-12-12 21:11:08 +00:00
hummypkg	25344c5ff4	add audio extraction git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@554 2a923420-c742-0410-a762-8d5b09965624	2011-12-09 20:33:57 +00:00
hummypkg	b6ce0e3b16	fix sorting of backups git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@553 2a923420-c742-0410-a762-8d5b09965624	2011-12-09 10:57:13 +00:00
hummypkg	a189b524ab	automatic daily schedule backups git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@551 2a923420-c742-0410-a762-8d5b09965624	2011-12-09 10:35:21 +00:00
hummypkg	84b00010a8	update icons git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@550 2a923420-c742-0410-a762-8d5b09965624	2011-12-09 10:12:02 +00:00
hummypkg	993958d346	update icons git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@549 2a923420-c742-0410-a762-8d5b09965624	2011-12-09 10:11:41 +00:00
hummypkg	1045587fbd	fix error on default browse directory git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@545 2a923420-c742-0410-a762-8d5b09965624	2011-12-06 00:13:41 +00:00