diff --git a/CONTROL/control b/CONTROL/control index bc99474..9122999 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 0.8.0-3 +Version: 0.8.0-4 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),jim-oo,jim-pack,service-control,busybox(>=1.18.3-1),lsof,epg(>=1.0.7),hmt(>=1.1.1),ssmtp diff --git a/var/mongoose/cgi-bin/browse.jim b/var/mongoose/cgi-bin/browse.jim index 456893e..d2c8009 100755 --- a/var/mongoose/cgi-bin/browse.jim +++ b/var/mongoose/cgi-bin/browse.jim @@ -80,8 +80,8 @@ proc entry {file} {{i 0}} { # Icons set locked 0 - set encd 1 - set odencd 0 + set encd 0 + set odencd 1 set def unknown set bx 0 if {$type eq "ts"} { diff --git a/var/mongoose/cgi-bin/browse/decrypt.jim b/var/mongoose/cgi-bin/browse/decrypt.jim index e39174b..4c1429e 100755 --- a/var/mongoose/cgi-bin/browse/decrypt.jim +++ b/var/mongoose/cgi-bin/browse/decrypt.jim @@ -18,6 +18,7 @@ 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 } diff --git a/var/mongoose/cgi-bin/dedup.jim b/var/mongoose/cgi-bin/dedup.jim index 1d04553..f75f849 100755 --- a/var/mongoose/cgi-bin/dedup.jim +++ b/var/mongoose/cgi-bin/dedup.jim @@ -74,6 +74,8 @@ foreach file [lsort [glob -nocomplain "$sdir"]] { puts -nonewline "Cannot process" } elseif {$base eq $fn} { puts -nonewline "Nothing to do" + } elseif {[file exists "$dir/$fn.ts"]} { + puts -nonewline "Preserving" } elseif {$doit} { # Dooooo, it. $ts settitle $syn