hummypkg/webif
5
3
Fork 4
Code Issues Pull Requests Releases 1 Activity

update status

Browse Source 
git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@1950 2a923420-c742-0410-a762-8d5b09965624
This commit is contained in:
hummypkg 2014-06-10 22:01:42 +00:00
parent aeb96c2c8a
commit 972366de14
2 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTROL/control
View File

@ -1,7 +1,7 @@
Package: webif Package: webif
Priority: optional Priority: optional
Section: web Section: web
Version: 1.0.14-7 Version: 1.0.14-8
Architecture: mipsel Architecture: mipsel
Maintainer: af123@hummypkg.org.uk Maintainer: af123@hummypkg.org.uk
Depends: webif-channelicons(>=1.1.11),lighttpd(>=1.4.35-2),jim(>=0.75-1),jim-oo,jim-sqlite3(>=0.75),jim-cgi(>=0.7),jim-binary(>=0.75),service-control(>=1.2),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.0.13),hmt(>=1.1.19),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2-1),stripts(>=1.2.5-3),smartmontools,tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),mongoose Depends: webif-channelicons(>=1.1.11),lighttpd(>=1.4.35-2),jim(>=0.75-1),jim-oo,jim-sqlite3(>=0.75),jim-cgi(>=0.7),jim-binary(>=0.75),service-control(>=1.2),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.0.13),hmt(>=1.1.19),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2-1),stripts(>=1.2.5-3),smartmontools,tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),mongoose

43
webif/cgi-bin/status.jim
View File

@ -24,7 +24,7 @@ if {[catch {set pid [exec pgrep -n humaxtv]}]} {
exit exit
} }
set exts {.ts .mkv .mp4} set exts {.ts .mkv .avi .mpg .mpeg .wmv .mp3 .mp4 .mov}
proc get_data {} { proc get_data {} {
global pid exts global pid exts
@ -50,18 +50,21 @@ proc get_data {} {
set size [string range $line 1 end] set size [string range $line 1 end]
} }
n { n {
if {[string first Video $line] == -1} { regsub -- { \([^\)]+\)$} $line "" line
continue
}
set ext [file extension $line] set ext [file extension $line]
if {$ext ni $exts} continue if {$ext ni $exts} continue
set name [file tail [file rootname $line]] set file [string range $line 1 end]
# Handle chase play (same file open twice) # Handle chase play (same file open twice
if {[dict exists $ret $name] && \ # and recently written)
if {[dict exists $ret $file] && \
$ext eq ".ts"} { $ext eq ".ts"} {
set ret($name) -1 set age [expr [clock seconds] - \
[file mtime $file]]
if {$age < 60} {
set ret($file) -1
}
} else { } else {
set ret($name) $size set ret($file) $size
} }
} }
} }
@ -84,18 +87,19 @@ if {[llength $data]} {
set ndata [get_data] set ndata [get_data]
# puts " DATA: ($data)" # puts " DATA: ($data)"
# puts " NDATA: ($ndata)" # puts " NDATA: ($ndata)"
foreach name [array names ndata] { foreach file [array names ndata] {
if {![dict exists $seen $name]} { set seen($name) 0 } set bname [file rootname [file tail $file]]
if {![dict exists $data $name]} { set data($name) 0 } if {![dict exists $seen $file]} { set seen($file) 0 }
if {[file exists "/mod/tmp/webif_auto/decrypting.$name.ts"]} { if {![dict exists $data $file]} { set data($file) 0 }
if {[file exists "/mod/tmp/webif_auto/decrypting.$bname.ts"]} {
set mode "Decrypting" set mode "Decrypting"
set icon "178_1_00_Icon_Lock.png style=\"padding: 0 0.2em 0 0.5em\"" set icon "178_1_00_Icon_Lock.png style=\"padding: 0 0.2em 0 0.5em\""
} elseif {$ndata($name) == -1} { } elseif {$ndata($file) == -1} {
incr rec incr rec
incr play incr play
set mode "Chase Playing" set mode "Chase Playing"
set icon "745_1_11_Video_3REC_Live.png" set icon "745_1_11_Video_3REC_Live.png"
} elseif {$ndata($name) > $data($name) && $seen($name) < 1} { } elseif {$ndata($file) > $data($file) && $seen($file) < 1} {
incr rec incr rec
set mode "Recording" set mode "Recording"
set icon "745_1_11_Video_1REC.png" set icon "745_1_11_Video_1REC.png"
@ -105,7 +109,14 @@ if {[llength $data]} {
set icon "745_1_10_Video_2Live.png" set icon "745_1_10_Video_2Live.png"
} }
incr seen($name) incr seen($file)
set name [string map {
"/mnt/hd2/My Video/" ""
"/media/drive1/Video/" ""
"/media/" ""
".ts" ""
} $file]
if {$runmode eq "cgi"} { if {$runmode eq "cgi"} {
lappend output [concat \ lappend output [concat \