af123/webif
1
0
Fork 0
forked from hummypkg/webif
Code Issues Pull Requests Releases Wiki Activity

1.3.2-1, add nugget dependency

Browse Source 
git-svn-id: file:///root/webif/svn/pkg/webif/trunk@3196 2a923420-c742-0410-a762-8d5b09965624
This commit is contained in:
hummypkg 2016-08-21 14:18:55 +00:00
parent a6f35d4fdb
commit f72cf64cce
5 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTROL/control
View File

@ -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/

2
webif/html/sched/list/index.jim
View File

@ -197,7 +197,7 @@ proc eventrow {event {table TBL_RESERVATION}} {
puts "<span class=ds>$ds</span>"
}
if {$showing} {
if {$table ne "pending" && $showing} {
set perc [expr [expr $n - $s] * 100 / $d]
puts "<br>"
puts "<img class=va

2
webif/html/settings/modules/advanced/settings.hook
View File

@ -12,7 +12,7 @@ puts -nonewline "
setting_toggle "Show development and advanced packages?" "pkgdev" $pkgdev
if {[system pkginst nugget]} {
if {[system nuggeted]} {
setting_toggle "Real-time scheduling? <span class=blood>(beta)</span>" "rtschedule" $rtschedule
}

4
webif/lib/rsv.class
View File

@ -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
}

11
webif/lib/system.class
View File

@ -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]