From 895dda6deeb95800eef41de2b84dc7a4eee52964 Mon Sep 17 00:00:00 2001 From: hummypkg Date: Wed, 30 May 2012 19:51:20 +0000 Subject: [PATCH] favourite order git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@1020 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 2 +- var/mongoose/cgi-bin/backup/backup.jim | 7 +++--- var/mongoose/cgi-bin/backup/restore.jim | 6 +++-- var/mongoose/cgi-bin/xepg.jim | 17 ++++++++------ var/mongoose/html/lib/footer.jim | 1 + var/mongoose/include/epg.jim | 12 +++++----- var/mongoose/include/toolbar.jim | 2 +- var/mongoose/lib/epg.class | 30 ++++++++++++++++++++----- 8 files changed, 52 insertions(+), 25 deletions(-) diff --git a/CONTROL/control b/CONTROL/control index b500346..c094cb6 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 0.9.9 +Version: 0.9.10 Architecture: mipsel Maintainer: af123@hummypkg.org.uk Depends: webif-channelicons(>=1.0.1),mongoose(>=3.0-7),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73),jim-cgi(>=0.5),service-control(>=1.2),busybox(>=1.19.3-1),lsof,epg(>=1.0.9),hmt(>=1.1.6),ssmtp,anacron,trm,openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.1) diff --git a/var/mongoose/cgi-bin/backup/backup.jim b/var/mongoose/cgi-bin/backup/backup.jim index d803c93..faac176 100755 --- a/var/mongoose/cgi-bin/backup/backup.jim +++ b/var/mongoose/cgi-bin/backup/backup.jim @@ -68,16 +68,17 @@ set grp 0 foreach res [$rsvdb query { select eFavGroup, TBL_FAV.eSvcType, - substr(szSvcName, 2) as szSvcName + substr(szSvcName, 2) as szSvcName, + favIdx from TBL_FAV join TBL_SVC using (hSvc) - order by eFavGroup + order by eFavGroup, favIdx }] { if {$res(eFavGroup) != $grp} { set grp $res(eFavGroup) puts " Group $grp" } puts " $res(szSvcName)" - puts $fd "fav\t$res(eFavGroup)\t$res(eSvcType)\t$res(szSvcName)" + puts $fd "fav\t$res(eFavGroup)\t$res(eSvcType)\t$res(szSvcName)\t$res(favIdx)" } puts "Done." diff --git a/var/mongoose/cgi-bin/backup/restore.jim b/var/mongoose/cgi-bin/backup/restore.jim index 723dc48..ed340a6 100755 --- a/var/mongoose/cgi-bin/backup/restore.jim +++ b/var/mongoose/cgi-bin/backup/restore.jim @@ -108,6 +108,8 @@ foreach line $data { set group [lindex $vals 1] set type [lindex $vals 2] set chan [lindex $vals 3] + set idx [lindex $vals 4] + if {$idx eq ""} { set idx 0 } set hsvc [get_channel_attr $chan] if {$grp != $group} { @@ -123,8 +125,8 @@ foreach line $data { } set query " - insert into pending.fav(hSvc, eFavGroup, eSvcType) - values($hsvc, $group, $type); + insert into pending.fav(favIdx, hSvc, eFavGroup, eSvcType) + values($idx, $hsvc, $group, $type); " $rsvdb query $query diff --git a/var/mongoose/cgi-bin/xepg.jim b/var/mongoose/cgi-bin/xepg.jim index 5ad6a65..8420d0a 100755 --- a/var/mongoose/cgi-bin/xepg.jim +++ b/var/mongoose/cgi-bin/xepg.jim @@ -29,7 +29,7 @@ if {$stt <= [clock seconds]} { set current 0 } -set favlist [epg favlist] +set favgroup [[settings] channel_group] set hours 4.0 set seconds $($hours * 3600) @@ -51,7 +51,13 @@ set secpx $($minpx / 60.0) set start [clock milliseconds] if {$::qepg} { - set records [epg dbfetch dump -trange "$stt:$ett"] + if {$favgroup} { + set records [epg dbfetch dump \ + -trange "$stt:$ett" -fav $favgroup] + } else { + set records [epg dbfetch dump -trange "$stt:$ett"] + } + } else { require channelsort set records [channelsort [epg fetch dump -trange "$stt:$ett"]] @@ -87,9 +93,6 @@ set lcn 0 set bg "odd" foreach e $records { - if {$favlist != "" && [$e get service_id] ni $favlist} { - continue - } set chnum [$e get channel_num] if {$chnum == 0} { continue } @@ -218,12 +221,12 @@ puts "
" +epg cleanup + set end [clock milliseconds] puts " Retrieved in: [expr [expr $got - $start] / 1000.0] seconds. " -epg cleanup - footer diff --git a/var/mongoose/html/lib/footer.jim b/var/mongoose/html/lib/footer.jim index 8135006..0f861b7 100755 --- a/var/mongoose/html/lib/footer.jim +++ b/var/mongoose/html/lib/footer.jim @@ -1,3 +1,4 @@ +#!/mod/bin/jimsh puts { diff --git a/var/mongoose/include/epg.jim b/var/mongoose/include/epg.jim index a421dfa..f496102 100755 --- a/var/mongoose/include/epg.jim +++ b/var/mongoose/include/epg.jim @@ -15,15 +15,20 @@ require epg_popup set start [clock milliseconds] set now [clock seconds] set then $($now + 14400) +set favgroup [[settings] channel_group] if {$::qepg} { - set records [epg dbfetch dump -trange "$now:$then"] + if {$favgroup} { + set records [epg dbfetch dump \ + -trange "$now:$then" -fav $favgroup] + } else { + set records [epg dbfetch dump -trange "$now:$then"] + } } else { require channelsort set records [channelsort [epg fetch dump -trange "$now:$then"]] } set got [clock milliseconds] -set favlist [epg favlist] puts { @@ -43,9 +48,6 @@ puts { set lcn 0 set num 0 foreach record $records { - if {$favlist != "" && [$record get service_id] ni $favlist} { - continue - } set chnum [$record get channel_num] if {$chnum == 0} { continue } diff --git a/var/mongoose/include/toolbar.jim b/var/mongoose/include/toolbar.jim index 50f549e..029d5f2 100755 --- a/var/mongoose/include/toolbar.jim +++ b/var/mongoose/include/toolbar.jim @@ -32,7 +32,7 @@ puts {
-
+