From e6ed9e9822263ac22dc67ecf686754c502fcbc36 Mon Sep 17 00:00:00 2001 From: hummypkg Date: Mon, 21 Mar 2016 19:38:42 +0000 Subject: [PATCH] update schedule backend, support episode skip git-svn-id: file:///root/webif/svn/pkg/webif/trunk@2806 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 4 ++-- webif/html/img/pause.png | Bin 0 -> 10745 bytes webif/html/img/skip.png | Bin 0 -> 10997 bytes webif/html/sched/index.jim | 2 +- webif/lib/rsv.class | 20 ++++++++++++++++++-- 5 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 webif/html/img/pause.png create mode 100644 webif/html/img/skip.png diff --git a/CONTROL/control b/CONTROL/control index 8d9b83db..46bb4780 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,10 +1,10 @@ Package: webif Priority: optional Section: web -Version: 1.2.8-10 +Version: 1.2.8-11 Architecture: mipsel 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: Description: An evolving web interface for the Humax. Tags: http://hummy.tv/forum/threads/6484/ diff --git a/webif/html/img/pause.png b/webif/html/img/pause.png new file mode 100644 index 0000000000000000000000000000000000000000..d396c6df016f2413c7691cec49bd7f5908c43e1a GIT binary patch literal 10745 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 literal 0 HcmV?d00001 diff --git a/webif/html/sched/index.jim b/webif/html/sched/index.jim index 2416e60b..79d7ce89 100755 --- a/webif/html/sched/index.jim +++ b/webif/html/sched/index.jim @@ -249,7 +249,7 @@ set pmap {} set events [rsv list pending] set num_ended 0 if {[llength $events] > 0} { - eventheader pending "Pending Scheduled Events" + eventheader pending "Pending Actions" foreach event $events { eventrow $event pending lappend pmap [ekey $event] diff --git a/webif/lib/rsv.class b/webif/lib/rsv.class index 081d56b0..a7a28f2a 100755 --- a/webif/lib/rsv.class +++ b/webif/lib/rsv.class @@ -175,6 +175,7 @@ rsv method pendingicon {{width 30}} { 2 { set icon "ar" } 3 { set icon "pad" } 4 { set icon "folder" } + 5 { set icon "skip" } } return "" } @@ -222,6 +223,19 @@ rsv method set_pad {{pre 60} {post 60}} { 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 {} { $::rsvdb query "delete from pending where ulslot = $ulslot" } @@ -315,7 +329,10 @@ rsv method insert {{table pending} {force 0}} { #puts $query #puts $bvals + $rsvdb query "begin transaction;" + $rsvdb query "delete from ${table} where ulslot = $ulslot;" $rsvdb query $query {*}$bvals + $rsvdb query "commit transaction;" } 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.nsttime = '%s' and $table.usevtid = '%s' - and $table.szEventToRecord = '%s' - " $ersvtype $hsvc $nsttime $usevtid $events] + " $ersvtype $hsvc $nsttime $usevtid] if {[llength $res] > 0} { return [rsv new [lindex $res 0]]