diff --git a/CONTROL/control b/CONTROL/control index 398c707..953dd1f 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 0.9.5-3 +Version: 0.9.6 Architecture: mipsel Maintainer: af123@hummypkg.org.uk 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) diff --git a/var/mongoose/cgi-bin/status.jim b/var/mongoose/cgi-bin/status.jim index d626e0c..6184f3a 100755 --- a/var/mongoose/cgi-bin/status.jim +++ b/var/mongoose/cgi-bin/status.jim @@ -22,8 +22,12 @@ proc get_data {} { 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 + if {[dict exists $ret $name]} { + set ret($name) -1 + } else { + set size [lindex [split $line " "] 6] + set ret($name) $size + } } } return $ret @@ -40,7 +44,12 @@ if {[llength $data]} { foreach name [array names ndata] { if {![dict exists $seen $name]} { set seen($name) 0 } if {![dict exists $data $name]} { set data($name) 0 } - if {$ndata($name) > $data($name) && $seen($name) < 1} { + if {$ndata($name) == -1} { + incr rec + incr play + set mode "Chase Playing" + set icon "745_1_11_Video_3REC_Live.png" + } elseif {$ndata($name) > $data($name) && $seen($name) < 1} { incr rec set mode "Recording" set icon "745_1_11_Video_1REC.png" @@ -53,7 +62,7 @@ if {[llength $data]} { incr seen($name) lappend output " - $mode $name" + $mode $name" } } @@ -85,10 +94,16 @@ if {![system instandby] && $play < 1} { lappend output "[epg channelicon $name 30 \ {vertical-align: middle; padding: 0 4px 0 2px}] - Watching $lcn: $name $prog" + Watching $lcn: $name $prog" } } +if {[system instandby]} { + lappend output " + System is in standby." +} + if {[llength $output]} { puts [join $output "
"] } diff --git a/var/mongoose/html/img/standby.png b/var/mongoose/html/img/standby.png new file mode 100644 index 0000000..22a8953 Binary files /dev/null and b/var/mongoose/html/img/standby.png differ