From d764969b8f67f623e64efd9c400b57222f291a38 Mon Sep 17 00:00:00 2001 From: hummypkg Date: Mon, 18 Jul 2011 19:26:58 +0000 Subject: [PATCH] update to 0.6.3, show alternate showings git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@280 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 2 +- var/mongoose/cgi-bin/epg_info.jim | 50 ++++++++++-- var/mongoose/cgi-bin/epg_search.jim | 9 ++- var/mongoose/cgi-bin/epg_service.jim | 14 ++-- var/mongoose/lib/epg.class | 45 ++++++++--- var/mongoose/lib/epg_popup | 117 ++++++++++++++------------- 6 files changed, 155 insertions(+), 82 deletions(-) diff --git a/CONTROL/control b/CONTROL/control index e5770a6..e65ea9a 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 0.6.2 +Version: 0.6.3 Architecture: mipsel Maintainer: af123@hummypkg.org.uk Depends: mongoose(>=3.0),jim(>=0.71-1),jim-sqlite3(>=0.71-1),jim-cgi(>=0.4),jim-oo,jim-pack,service-control,busybox(>=1.18.3-1),lsof,epg(>=1.0.2),hmt(>=1.0.6),ssmtp diff --git a/var/mongoose/cgi-bin/epg_info.jim b/var/mongoose/cgi-bin/epg_info.jim index 53cdd4b..0b8dfeb 100755 --- a/var/mongoose/cgi-bin/epg_info.jim +++ b/var/mongoose/cgi-bin/epg_info.jim @@ -16,11 +16,24 @@ set event 0 catch { set event [dict get $_cgi event] } if {! [dict exists $_cgi bare]} { header } -#set service 8384 -#set event 25293 +#set service 8448 +#set event 30843 set record [lindex [epg fetch dump -service $service -event $event] 0] $record get_channel_info +set others [$record othertimes] + +puts { + +} puts " @@ -32,7 +45,29 @@ puts " - + - - + " } diff --git a/var/mongoose/cgi-bin/epg_search.jim b/var/mongoose/cgi-bin/epg_search.jim index 12dd7c7..a9d1944 100755 --- a/var/mongoose/cgi-bin/epg_search.jim +++ b/var/mongoose/cgi-bin/epg_search.jim @@ -95,9 +95,14 @@ foreach record [lsort -command rsort $records] { } altrow $record get_channel_info - puts "" + [clock format [$record get start] -format "%H:%M %Z"]" + puts "" puts "" puts "" puts "" } else { puts "" } - puts "" - puts "" + if $ended { puts "" + if $ended { puts "" puts [$record cell] puts "" puts "" diff --git a/var/mongoose/lib/epg.class b/var/mongoose/lib/epg.class index 8061c4c..af10809 100644 --- a/var/mongoose/lib/epg.class +++ b/var/mongoose/lib/epg.class @@ -70,8 +70,15 @@ epg method percent {} { } epg method showing {} { - set percent [$self percent] - if {$percent > 0 && $percent < 100} { return 1 } else { return 0 } + set now [clock seconds] + if {$start > $now} { return 0 } + if {$start + $duration < $now} { return 0 } + return 1 +} + +epg method ended {} { + if {$start + $duration < [clock seconds]} { return 1 } + return 0 } epg method elapsed {} { @@ -152,15 +159,7 @@ epg method get_rsv {} { } } -epg method icon_set {{height 0}} { - if {$height > 0} { set height "height=$height" } else { set height "" } - set icon [$self type_icon] - set set "" - if {$icon != ""} { - lappend set "\"$content_type\"" - } - +epg method process_sched {} { set sched_type 0 if {$event_crid ne "" && "$channel_hsvc$event_crid" in $::rsvlookup} { set sched_type 1 @@ -170,6 +169,18 @@ epg method icon_set {{height 0}} { "$channel_hsvc$series_crid" in $::rsvlookup} { set sched_type 2 } +} + +epg method icon_set {{height 0}} { + if {$height > 0} { set height "height=$height" } else { set height "" } + set icon [$self type_icon] + set set "" + if {$icon != ""} { + lappend set "\"$content_type\"" + } + + $self process_sched if {$sched_type == 2} { lappend set \ @@ -240,6 +251,18 @@ epg method recommended {} { return $rec } +epg method othertimes {} { + if {$event_crid eq ""} { return "" } + + set others "" + foreach other [epg fetch dump -crid $event_crid] { + if {[$other get service_id] == $service_id && + [$other get event_id] == $event_id} { continue } + lappend others $other + } + return $others +} + proc {epg parse} {line} { set e [epg new] $e _parse $line diff --git a/var/mongoose/lib/epg_popup b/var/mongoose/lib/epg_popup index d13fab1..8e2b097 100644 --- a/var/mongoose/lib/epg_popup +++ b/var/mongoose/lib/epg_popup @@ -1,63 +1,70 @@ puts {
}
[$record get text]
Start[clock format [$record get start] -format {%c %Z}][clock format [$record get start] -format {%c %Z}] +" + +foreach o $others { + if {[$o ended]} { continue } + $o get_channel_info + $o process_sched + if {[$o get series_crid] eq ""} { set ro 1 } else { set ro 2 } + puts -nonewline "
    " + puts -nonewline "Also: " + puts -nonewline "" + puts -nonewline "[clock format [$o get start] -format {%c %Z}]" + puts -nonewline " on " + puts -nonewline [$o channel_icon 16] + puts -nonewline "[$o get channel_name] " + puts "" + puts "" +} + +puts " +
Duration [clock format [$record get duration] -format %T] @@ -60,8 +95,13 @@ if {[$record get warning] != ""} { if {[$record get event_crid] != ""} { puts "
CRID[$record get channel_crid][$record get event_crid]CRID + + + [$record get channel_crid][$record get event_crid] + +
+ + set ended [$record ended] + + if $ended { puts "" } else { puts ""} + puts " [clock format [$record get start] -format "%a %d %b %Y"]
- [clock format [$record get start] -format "%H:%M %Z"]		[$record get channel_num][$record channel_icon 50] diff --git a/var/mongoose/cgi-bin/epg_service.jim b/var/mongoose/cgi-bin/epg_service.jim index 1fadae6..fba26a8 100755 --- a/var/mongoose/cgi-bin/epg_service.jim +++ b/var/mongoose/cgi-bin/epg_service.jim @@ -20,10 +20,7 @@ cgi_input require epg_popup -set service 0 -set service 4351 -catch { set service [dict get $_cgi service] } - +set service [cgi_get service 4351] set records [epg fetch dump -service $service] set tr [lindex $records 0] @@ -55,13 +52,14 @@ set i 0 foreach record $records { altrow $record get_channel_info + set ended [$record ended] if {[$record showing]} { puts " - [clock format [$record get start] -format "%a %d %b %Y"] - [clock format [$record get start] -format "%H:%M"]" } else { puts "" } + puts "[clock format [$record get start] -format "%a %d %b %Y"]" } else { puts "" } + puts "[clock format [$record get start] -format "%H:%M"][$record get text][$record get warning]