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

scheduling updates + AR in progress

Browse Source 
git-svn-id: file:///root/webif/svn/pkg/webif/trunk@3210 2a923420-c742-0410-a762-8d5b09965624
This commit is contained in:
hummypkg 2016-08-25 19:02:11 +00:00
parent 8ed615459f
commit b13337653d
5 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTROL/control
View File

@ -4,7 +4,7 @@ Section: web
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,nugget(>=0.91)
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.6),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.92)
Suggests:
Description: An evolving web interface for the Humax.
Tags: http://hummy.tv/forum/threads/7116/

7
webif/html/css/style.css
View File

@ -525,6 +525,13 @@ img.doublebmp
position: relative;
}
.stackimg
{
position: absolute;
height: 20px;
width: 29px;
}
span.foldernum
{
display: none;

BIN
webif/html/img/ripple.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

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

@ -98,6 +98,15 @@ proc eventrow {event {table TBL_RESERVATION}} {
set showing 0
}
switch -- [$event status] {
"idle" -
"ready" { set showing 0 }
"arwatch" { set showing 2; set ended 0 }
"recording" { set showing 1; set ended 0 }
}
if {$table eq "pending"} { set showing 0 }
set attrs "table=$table sid=[$event get ulslot] \
reckind=[$event get ucRecKind] rsvtype=[$event get ersvtype] \
ar=[expr ! [$event padded]] ended=$ended"
@ -198,9 +207,17 @@ proc eventrow {event {table TBL_RESERVATION}} {
puts "<span class=ds>$ds</span>"
}
if {$table ne "pending" && $showing} {
set perc [expr [expr $n - ($s - $sp)] * 100 / \
($d + $sp + $ep)]
if {$showing == 2} {
# AR watch
puts "
<span class=relative>
<img class=\"stackimg va\" src=/img/ar.png>
<img class=\"stackimg va\" src=/img/ripple.gif>
</span>
"
} elseif {$showing} {
set perc $(($n - ($s - $sp)) * 100 / \
($d + $sp + $ep))
puts "<br>"
puts "<img class=va
src=/images/745_1_11_Video_1REC.png>"
@ -268,6 +285,9 @@ proc eventrow {event {table TBL_RESERVATION}} {
} else {
puts "--:--:--"
}
if {$showing == 1} {
puts "<br><img src=/img/blank.gif height=31>"
}
if {$c > 1} {
set i 0
foreach e $elist {

14
webif/lib/rsv.class
View File

@ -60,6 +60,18 @@ class rsv {
require findhsvc
if {![exists -proc binary]} { package require binary }
rsv method status {} {
set stat -1
catch {set stat [exec /mod/bin/nugget schedule.timers.status $ulslot]}
switch -- $stat {
"0,0" { return "idle" }
"1,1" { return "ready" }
"2,1" { return "arwatch" }
"2,2" { return "recording" }
default { return "unknown" }
}
}
rsv method aul {} {
set aul {}
for {set i 0} {$i < [string length $aulEventToRecordInfo]} {
@ -624,7 +636,7 @@ proc {rsv construct} {event type} {
set args(eReady) 30
lassign [system padding] args(ulPreOffset) args(ulPostOffset)
set ccrid [$event get channel_crid]
set ccrid [string toupper [$event get channel_crid]]
# Fallback from series to event if there is no series CRID.
if {$type == 2 && [$event get series_crid] eq ""} {