From b13337653d372d40457e3e19d5c0f9e0f8011c93 Mon Sep 17 00:00:00 2001 From: hummypkg Date: Thu, 25 Aug 2016 19:02:11 +0000 Subject: [PATCH] scheduling updates + AR in progress git-svn-id: file:///root/webif/svn/pkg/webif/trunk@3210 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 2 +- webif/html/css/style.css | 7 +++++++ webif/html/img/ripple.gif | Bin 0 -> 5933 bytes webif/html/sched/list/index.jim | 26 +++++++++++++++++++++++--- webif/lib/rsv.class | 14 +++++++++++++- 5 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 webif/html/img/ripple.gif diff --git a/CONTROL/control b/CONTROL/control index 6a9eea26..57d7aa5d 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -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/ diff --git a/webif/html/css/style.css b/webif/html/css/style.css index 639e717d..5ffb316d 100644 --- a/webif/html/css/style.css +++ b/webif/html/css/style.css @@ -525,6 +525,13 @@ img.doublebmp position: relative; } +.stackimg +{ + position: absolute; + height: 20px; + width: 29px; +} + span.foldernum { display: none; diff --git a/webif/html/img/ripple.gif b/webif/html/img/ripple.gif new file mode 100644 index 0000000000000000000000000000000000000000..ce0916795165a7095195c78b324460712590c381 GIT binary patch literal 5933 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" } - if {$table ne "pending" && $showing} { - set perc [expr [expr $n - ($s - $sp)] * 100 / \ - ($d + $sp + $ep)] + if {$showing == 2} { + # AR watch + puts " + + + + + " + } elseif {$showing} { + set perc $(($n - ($s - $sp)) * 100 / \ + ($d + $sp + $ep)) puts "
" puts "" @@ -268,6 +285,9 @@ proc eventrow {event {table TBL_RESERVATION}} { } else { puts "--:--:--" } + if {$showing == 1} { + puts "
" + } if {$c > 1} { set i 0 foreach e $elist { diff --git a/webif/lib/rsv.class b/webif/lib/rsv.class index 15ce3c61..de93ed33 100755 --- a/webif/lib/rsv.class +++ b/webif/lib/rsv.class @@ -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 ""} {