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

update schedule backend, support episode skip

Browse Source 
git-svn-id: file:///root/webif/svn/pkg/webif/trunk@2806 2a923420-c742-0410-a762-8d5b09965624
This commit is contained in:
hummypkg 2016-03-21 19:38:42 +00:00
parent c6e933999b
commit e6ed9e9822
5 changed files with 21 additions and 5 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 Package: webif
Priority: optional Priority: optional
Section: web Section: web
Version: 1.2.8-10 Version: 1.2.8-11
Architecture: mipsel Architecture: mipsel
Maintainer: af123@hummypkg.org.uk Maintainer: af123@hummypkg.org.uk
Depends: tcpfix,webif-channelicons(>=1.1.20),lighttpd(>=1.4.39-1),jim(>=0.76),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.1),hmt(>=2.0.9),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),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) Depends: tcpfix,webif-channelicons(>=1.1.20),lighttpd(>=1.4.39-1),jim(>=0.76),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.1),hmt(>=2.0.9),ssmtp,cron-daemon(>=1.18.3-2),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),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)
Suggests: Suggests:
Description: An evolving web interface for the Humax. Description: An evolving web interface for the Humax.
Tags: http://hummy.tv/forum/threads/6484/ Tags: http://hummy.tv/forum/threads/6484/

BIN
webif/html/img/pause.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
webif/html/img/skip.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

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

@ -249,7 +249,7 @@ set pmap {}
set events [rsv list pending] set events [rsv list pending]
set num_ended 0 set num_ended 0
if {[llength $events] > 0} { if {[llength $events] > 0} {
eventheader pending "Pending Scheduled Events" eventheader pending "Pending Actions"
foreach event $events { foreach event $events {
eventrow $event pending eventrow $event pending
lappend pmap [ekey $event] lappend pmap [ekey $event]

20
webif/lib/rsv.class
View File

@ -175,6 +175,7 @@ rsv method pendingicon {{width 30}} {
2 { set icon "ar" } 2 { set icon "ar" }
3 { set icon "pad" } 3 { set icon "pad" }
4 { set icon "folder" } 4 { set icon "folder" }
5 { set icon "skip" }
} }
return "<img class=va width=$width src=/img/$icon.png>" return "<img class=va width=$width src=/img/$icon.png>"
} }
@ -222,6 +223,19 @@ rsv method set_pad {{pre 60} {post 60}} {
set ulPostOffset $post set ulPostOffset $post
} }
rsv method set_skip {event} {
set action 5
$event get_channel_info
set crid "[$event get channel_crid][$event get event_crid]"
set szRecordedProgCrid "1$crid|$szRecordedProgCrid"
set szEventToRecord [string map "1$crid| {}" $szEventToRecord]
set aulEventToRecordInfo ""
set nsttime [$event get start]
set nduration [$event get duration]
}
rsv method remove_pending {} { rsv method remove_pending {} {
$::rsvdb query "delete from pending where ulslot = $ulslot" $::rsvdb query "delete from pending where ulslot = $ulslot"
} }
@ -315,7 +329,10 @@ rsv method insert {{table pending} {force 0}} {
#puts $query #puts $query
#puts $bvals #puts $bvals
$rsvdb query "begin transaction;"
$rsvdb query "delete from ${table} where ulslot = $ulslot;"
$rsvdb query $query {*}$bvals $rsvdb query $query {*}$bvals
$rsvdb query "commit transaction;"
} }
proc {rsv list} {{table tbl_reservation} {extra ""}} { proc {rsv list} {{table tbl_reservation} {extra ""}} {
@ -429,8 +446,7 @@ proc {rsv fetch} {{table TBL_RESERVATION} ersvtype hsvc nsttime usevtid events}
and $table.hsvc = '%s' and $table.hsvc = '%s'
and $table.nsttime = '%s' and $table.nsttime = '%s'
and $table.usevtid = '%s' and $table.usevtid = '%s'
and $table.szEventToRecord = '%s' " $ersvtype $hsvc $nsttime $usevtid]
" $ersvtype $hsvc $nsttime $usevtid $events]
if {[llength $res] > 0} { if {[llength $res] > 0} {
return [rsv new [lindex $res 0]] return [rsv new [lindex $res 0]]