diff --git a/CONTROL/control b/CONTROL/control index 40f72d3a..6a9eea26 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,10 +1,10 @@ Package: webif Priority: optional Section: web -Version: 1.3.2 +Version: 1.3.2-1 Architecture: mipsel Maintainer: af123@hpkg.tv -Depends: tcpfix,webif-channelicons(>=1.1.24),lighttpd(>=1.4.39-1),jim(>=0.76-2),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.3),hmt(>=2.0.10),ssmtp,cron-daemon(>=1.18.3-3),at(>=3.1.18),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.1.5),webif-charts(>=1.2-1),stripts(>=1.2.5-3),tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7),hwctl +Depends: tcpfix,webif-channelicons(>=1.1.24),lighttpd(>=1.4.39-1),jim(>=0.76-2),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.3),hmt(>=2.0.10),ssmtp,cron-daemon(>=1.18.3-3),at(>=3.1.18),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.1.5),webif-charts(>=1.2-1),stripts(>=1.2.5-3),tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7),hwctl,nugget(>=0.91) Suggests: Description: An evolving web interface for the Humax. Tags: http://hummy.tv/forum/threads/7116/ diff --git a/webif/html/sched/list/index.jim b/webif/html/sched/list/index.jim index 7349584f..22c15b98 100755 --- a/webif/html/sched/list/index.jim +++ b/webif/html/sched/list/index.jim @@ -197,7 +197,7 @@ proc eventrow {event {table TBL_RESERVATION}} { puts "$ds" } - if {$showing} { + if {$table ne "pending" && $showing} { set perc [expr [expr $n - $s] * 100 / $d] puts "
" puts "(beta)" "rtschedule" $rtschedule } diff --git a/webif/lib/rsv.class b/webif/lib/rsv.class index c0243f26..12a9951e 100755 --- a/webif/lib/rsv.class +++ b/webif/lib/rsv.class @@ -333,7 +333,7 @@ rsv method insert {{table pending} {force 0} {defer 0}} { # In-progress check if {$nsttime <= $now} { - if {$nsttime + $nduration >= $now} { + if {$table ne "pending" && $nsttime + $nduration >= $now} { # Still showing - OK if real-time scheduling addition. if {$action != 0 || ![rsv rtsched]} { throw 20 "Event already in progress." @@ -575,7 +575,7 @@ proc {rsv cleanup} {} { } proc {rsv rtsched} {} { - if {![system pkginst nugget]} { return 0 } + if {![system nuggeted]} { return 0 } if {![[settings] rtschedule]} { return 0 } return 1 } diff --git a/webif/lib/system.class b/webif/lib/system.class index 4482582c..f6d5f61f 100644 --- a/webif/lib/system.class +++ b/webif/lib/system.class @@ -617,6 +617,17 @@ proc {system connectivity} {{site "hpkg.tv"} {port 80} {ret "0"}} { } } +proc {system nuggeted} {} { + if {![system pkginst nugget]} { return 0 } + set ret 0 + catch { + if {[exec /mod/bin/nugget ping] eq "PONG"} { + set ret 1 + } + } + return $ret +} + proc {system strip} {str} { if {[string range $str 1 2] eq "i7"} { set str [string range $str 3 end]