diff --git a/var/mongoose/cgi-bin/epg_info.jim b/var/mongoose/cgi-bin/epg_info.jim new file mode 100755 index 0000000..ea4f0cd --- /dev/null +++ b/var/mongoose/cgi-bin/epg_info.jim @@ -0,0 +1,100 @@ +#!/mod/bin/jimsh + +package require cgi +source /mod/var/mongoose/lib/epg.class + +puts "Content-Type: text/html" +puts "" + +cgi_input +#cgi_dump + +set service 0 +catch { set service [dict get $_cgi service] } +set event 0 +catch { set event [dict get $_cgi event] } +if {! [dict exists $_cgi bare]} { + source /mod/var/mongoose/html/lib/header.jim +} + +#set service 8384 +#set event 25293 + +set record [lindex [epg fetch dump -service $service -event $event] 0] + +puts " + + + + + + + + + + + + + + + + + +" + +if {[$record get warning] != ""} { + puts " + + + + + " +} + +if {[$record get event_crid] != ""} { + puts " + + + + + " +} + +if {[$record get series_crid] != ""} { + puts " + + + + " +} + +if {[$record get rec_crid] != ""} { + set rec [$record recommended] + if {$rec != ""} { + puts "" + } +} + +puts " + + + +
Programme[$record get name]
Synopsis[$record get text]
Start[clock format [$record get start] -format {%c %Z}]
Duration[clock format [$record get duration] -format %T]
Type[$record get content_type] ([$record get content_code])
Warning[$record get warning]
CRID[$record get channel_crid][$record get event_crid]
Series CRID + + [$record get channel_crid][$record get series_crid] + +
Recommends + + [$rec get name] + ([$rec get channel_crid][$rec get event_crid]) + +
+ [$record icon_set] +
+" + +epg cleanup +if {! [dict exists $_cgi bare]} { + source /mod/var/mongoose/html/lib/footer.jim +} + diff --git a/var/mongoose/cgi-bin/epg_search.jim b/var/mongoose/cgi-bin/epg_search.jim index 843f9ac..e3a298b 100755 --- a/var/mongoose/cgi-bin/epg_search.jim +++ b/var/mongoose/cgi-bin/epg_search.jim @@ -22,6 +22,10 @@ set cmd "search" if {[dict exists $_cgi full]} { set cmd "searchall" } set ct 0 catch { set ct [dict get $_cgi ct] } +set crid "" +catch { set crid [dict get $_cgi crid] } +set scrid "" +catch { set scrid [dict get $_cgi scrid] } puts "
@@ -89,6 +93,10 @@ puts "
" if {$ct > 0 } { set records [epg fetch dump -type $ct] +} elseif {$crid ne ""} { + set records [epg fetch dump -crid $crid] +} elseif {$scrid ne ""} { + set records [epg fetch dump -scrid $scrid] } elseif {$term ne ""} { set records [epg fetch $cmd -extra $term] } diff --git a/var/mongoose/cgi-bin/epg_service.jim b/var/mongoose/cgi-bin/epg_service.jim index 0cd1dc4..4f2ed5c 100755 --- a/var/mongoose/cgi-bin/epg_service.jim +++ b/var/mongoose/cgi-bin/epg_service.jim @@ -2,6 +2,7 @@ package require cgi source /mod/var/mongoose/lib/epg.class +source /mod/var/mongoose/lib/spinner.class source /mod/var/mongoose/lib/altrow puts "Content-Type: text/html" @@ -9,6 +10,12 @@ puts "" source /mod/var/mongoose/html/lib/header.jim +[spinner new { + text "Loading EPG Data..." + size "1.2em" + style "margin: 1em;" + }] start + cgi_input #cgi_dump diff --git a/var/mongoose/html/css/jquery-ui.css b/var/mongoose/html/css/jquery-ui.css index 8ab342d..434421c 100644 --- a/var/mongoose/html/css/jquery-ui.css +++ b/var/mongoose/html/css/jquery-ui.css @@ -50,7 +50,7 @@ * * http://docs.jquery.com/UI/Theming/API * - * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Segoe%20UI,%20Arial,%20sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=8px&bgColorHeader=817865&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=45&borderColorHeader=494437&fcHeader=ffffff&iconColorHeader=fadc7a&bgColorContent=feeebd&bgTextureContent=03_highlight_soft.png&bgImgOpacityContent=100&borderColorContent=8e846b&fcContent=383838&iconColorContent=d19405&bgColorDefault=fece2f&bgTextureDefault=12_gloss_wave.png&bgImgOpacityDefault=60&borderColorDefault=d19405&fcDefault=4c3000&iconColorDefault=3d3d3d&bgColorHover=ffdd57&bgTextureHover=12_gloss_wave.png&bgImgOpacityHover=70&borderColorHover=a45b13&fcHover=381f00&iconColorHover=bd7b00&bgColorActive=ffffff&bgTextureActive=05_inset_soft.png&bgImgOpacityActive=30&borderColorActive=655e4e&fcActive=0074c7&iconColorActive=eb990f&bgColorHighlight=fff9e5&bgTextureHighlight=12_gloss_wave.png&bgImgOpacityHighlight=90&borderColorHighlight=eeb420&fcHighlight=1f1f1f&iconColorHighlight=ed9f26&bgColorError=d34d17&bgTextureError=07_diagonals_medium.png&bgImgOpacityError=20&borderColorError=ffb73d&fcError=ffffff&iconColorError=ffe180&bgColorOverlay=5c5c5c&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=50&opacityOverlay=80&bgColorShadow=cccccc&bgTextureShadow=01_flat.png&bgImgOpacityShadow=30&opacityShadow=60&thicknessShadow=7px&offsetTopShadow=-7px&offsetLeftShadow=-7px&cornerRadiusShadow=8px + * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Segoe%20UI,%20Arial,%20sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=8px&bgColorHeader=ccff99&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=45&borderColorHeader=494437&fcHeader=000000&iconColorHeader=554e34&bgColorContent=ffffcc&bgTextureContent=03_highlight_soft.png&bgImgOpacityContent=100&borderColorContent=8e846b&fcContent=383838&iconColorContent=d19405&bgColorDefault=fece2f&bgTextureDefault=12_gloss_wave.png&bgImgOpacityDefault=60&borderColorDefault=d19405&fcDefault=4c3000&iconColorDefault=3d3d3d&bgColorHover=ffdd57&bgTextureHover=12_gloss_wave.png&bgImgOpacityHover=70&borderColorHover=a45b13&fcHover=381f00&iconColorHover=bd7b00&bgColorActive=ffffff&bgTextureActive=05_inset_soft.png&bgImgOpacityActive=30&borderColorActive=655e4e&fcActive=0074c7&iconColorActive=eb990f&bgColorHighlight=fff9e5&bgTextureHighlight=12_gloss_wave.png&bgImgOpacityHighlight=90&borderColorHighlight=eeb420&fcHighlight=1f1f1f&iconColorHighlight=ed9f26&bgColorError=d34d17&bgTextureError=07_diagonals_medium.png&bgImgOpacityError=20&borderColorError=ffb73d&fcError=ffffff&iconColorError=ffe180&bgColorOverlay=5c5c5c&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=50&opacityOverlay=80&bgColorShadow=cccccc&bgTextureShadow=01_flat.png&bgImgOpacityShadow=30&opacityShadow=60&thicknessShadow=7px&offsetTopShadow=-7px&offsetLeftShadow=-7px&cornerRadiusShadow=8px */ @@ -59,10 +59,10 @@ .ui-widget { font-family: Segoe UI, Arial, sans-serif; font-size: 1.1em; } .ui-widget .ui-widget { font-size: 1em; } .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Segoe UI, Arial, sans-serif; font-size: 1em; } -.ui-widget-content { border: 1px solid #8e846b; background: #feeebd url(/img/ui/ui-bg_highlight-soft_100_feeebd_1x100.png) 50% top repeat-x; color: #383838; } +.ui-widget-content { border: 1px solid #8e846b; background: #ffffcc url(/img/ui/ui-bg_highlight-soft_100_ffffcc_1x100.png) 50% top repeat-x; color: #383838; } .ui-widget-content a { color: #383838; } -.ui-widget-header { border: 1px solid #494437; background: #817865 url(/img/ui/ui-bg_gloss-wave_45_817865_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; } -.ui-widget-header a { color: #ffffff; } +.ui-widget-header { border: 1px solid #494437; background: #ccff99 url(/img/ui/ui-bg_gloss-wave_45_ccff99_500x100.png) 50% 50% repeat-x; color: #000000; font-weight: bold; } +.ui-widget-header a { color: #000000; } /* Interaction states ----------------------------------*/ @@ -91,7 +91,7 @@ /* states and images */ .ui-icon { width: 16px; height: 16px; background-image: url(/img/ui/ui-icons_d19405_256x240.png); } .ui-widget-content .ui-icon {background-image: url(/img/ui/ui-icons_d19405_256x240.png); } -.ui-widget-header .ui-icon {background-image: url(/img/ui/ui-icons_fadc7a_256x240.png); } +.ui-widget-header .ui-icon {background-image: url(/img/ui/ui-icons_554e34_256x240.png); } .ui-state-default .ui-icon { background-image: url(/img/ui/ui-icons_3d3d3d_256x240.png); } .ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(/img/ui/ui-icons_bd7b00_256x240.png); } .ui-state-active .ui-icon {background-image: url(/img/ui/ui-icons_eb990f_256x240.png); } diff --git a/var/mongoose/html/css/style.css b/var/mongoose/html/css/style.css index 9b1a122..093c0d1 100644 --- a/var/mongoose/html/css/style.css +++ b/var/mongoose/html/css/style.css @@ -86,6 +86,21 @@ table th text-align: left; } +table.keyval th +{ + background: #ccff99; + font-weight: bold; + text-align: right; + color: black; + padding: 0.5em; +} + +table.keyval td +{ + background: #ffffcc; + color: black; +} + pre { font-family: Consolas, 'Courier New', Courier, monospace; diff --git a/var/mongoose/html/img/loading.gif b/var/mongoose/html/img/loading.gif new file mode 100644 index 0000000..1560b64 Binary files /dev/null and b/var/mongoose/html/img/loading.gif differ diff --git a/var/mongoose/html/img/ui/ui-bg_diagonals-medium_20_d34d17_40x40.png b/var/mongoose/html/img/ui/ui-bg_diagonals-medium_20_d34d17_40x40.png new file mode 100644 index 0000000..d8bd1be Binary files /dev/null and b/var/mongoose/html/img/ui/ui-bg_diagonals-medium_20_d34d17_40x40.png differ diff --git a/var/mongoose/html/img/ui/ui-bg_flat_0_aaaaaa_40x100.png b/var/mongoose/html/img/ui/ui-bg_flat_0_aaaaaa_40x100.png deleted file mode 100644 index 5b5dab2..0000000 Binary files a/var/mongoose/html/img/ui/ui-bg_flat_0_aaaaaa_40x100.png and /dev/null differ diff --git a/var/mongoose/html/img/ui/ui-bg_flat_30_cccccc_40x100.png b/var/mongoose/html/img/ui/ui-bg_flat_30_cccccc_40x100.png new file mode 100644 index 0000000..5473aff Binary files /dev/null and b/var/mongoose/html/img/ui/ui-bg_flat_30_cccccc_40x100.png differ diff --git a/var/mongoose/html/img/ui/ui-bg_flat_50_5c5c5c_40x100.png b/var/mongoose/html/img/ui/ui-bg_flat_50_5c5c5c_40x100.png new file mode 100644 index 0000000..2d53a67 Binary files /dev/null and b/var/mongoose/html/img/ui/ui-bg_flat_50_5c5c5c_40x100.png differ diff --git a/var/mongoose/html/img/ui/ui-bg_flat_75_ffffff_40x100.png b/var/mongoose/html/img/ui/ui-bg_flat_75_ffffff_40x100.png deleted file mode 100644 index ac8b229..0000000 Binary files a/var/mongoose/html/img/ui/ui-bg_flat_75_ffffff_40x100.png and /dev/null differ diff --git a/var/mongoose/html/img/ui/ui-bg_glass_55_fbf9ee_1x400.png b/var/mongoose/html/img/ui/ui-bg_glass_55_fbf9ee_1x400.png deleted file mode 100644 index ad3d634..0000000 Binary files a/var/mongoose/html/img/ui/ui-bg_glass_55_fbf9ee_1x400.png and /dev/null differ diff --git a/var/mongoose/html/img/ui/ui-bg_glass_65_ffffff_1x400.png b/var/mongoose/html/img/ui/ui-bg_glass_65_ffffff_1x400.png deleted file mode 100644 index 42ccba2..0000000 Binary files a/var/mongoose/html/img/ui/ui-bg_glass_65_ffffff_1x400.png and /dev/null differ diff --git a/var/mongoose/html/img/ui/ui-bg_glass_75_dadada_1x400.png b/var/mongoose/html/img/ui/ui-bg_glass_75_dadada_1x400.png deleted file mode 100644 index 5a46b47..0000000 Binary files a/var/mongoose/html/img/ui/ui-bg_glass_75_dadada_1x400.png and /dev/null differ diff --git a/var/mongoose/html/img/ui/ui-bg_glass_75_e6e6e6_1x400.png b/var/mongoose/html/img/ui/ui-bg_glass_75_e6e6e6_1x400.png deleted file mode 100644 index 86c2baa..0000000 Binary files a/var/mongoose/html/img/ui/ui-bg_glass_75_e6e6e6_1x400.png and /dev/null differ diff --git a/var/mongoose/html/img/ui/ui-bg_glass_95_fef1ec_1x400.png b/var/mongoose/html/img/ui/ui-bg_glass_95_fef1ec_1x400.png deleted file mode 100644 index 4443fdc..0000000 Binary files a/var/mongoose/html/img/ui/ui-bg_glass_95_fef1ec_1x400.png and /dev/null differ diff --git a/var/mongoose/html/img/ui/ui-bg_gloss-wave_45_ccff99_500x100.png b/var/mongoose/html/img/ui/ui-bg_gloss-wave_45_ccff99_500x100.png new file mode 100644 index 0000000..fa4a357 Binary files /dev/null and b/var/mongoose/html/img/ui/ui-bg_gloss-wave_45_ccff99_500x100.png differ diff --git a/var/mongoose/html/img/ui/ui-bg_gloss-wave_60_fece2f_500x100.png b/var/mongoose/html/img/ui/ui-bg_gloss-wave_60_fece2f_500x100.png new file mode 100644 index 0000000..01ccab3 Binary files /dev/null and b/var/mongoose/html/img/ui/ui-bg_gloss-wave_60_fece2f_500x100.png differ diff --git a/var/mongoose/html/img/ui/ui-bg_gloss-wave_70_ffdd57_500x100.png b/var/mongoose/html/img/ui/ui-bg_gloss-wave_70_ffdd57_500x100.png new file mode 100644 index 0000000..f8bd104 Binary files /dev/null and b/var/mongoose/html/img/ui/ui-bg_gloss-wave_70_ffdd57_500x100.png differ diff --git a/var/mongoose/html/img/ui/ui-bg_gloss-wave_90_fff9e5_500x100.png b/var/mongoose/html/img/ui/ui-bg_gloss-wave_90_fff9e5_500x100.png new file mode 100644 index 0000000..6e3ad2d Binary files /dev/null and b/var/mongoose/html/img/ui/ui-bg_gloss-wave_90_fff9e5_500x100.png differ diff --git a/var/mongoose/html/img/ui/ui-bg_highlight-soft_100_ffffcc_1x100.png b/var/mongoose/html/img/ui/ui-bg_highlight-soft_100_ffffcc_1x100.png new file mode 100644 index 0000000..ff8b536 Binary files /dev/null and b/var/mongoose/html/img/ui/ui-bg_highlight-soft_100_ffffcc_1x100.png differ diff --git a/var/mongoose/html/img/ui/ui-bg_highlight-soft_75_cccccc_1x100.png b/var/mongoose/html/img/ui/ui-bg_highlight-soft_75_cccccc_1x100.png deleted file mode 100644 index 7c9fa6c..0000000 Binary files a/var/mongoose/html/img/ui/ui-bg_highlight-soft_75_cccccc_1x100.png and /dev/null differ diff --git a/var/mongoose/html/img/ui/ui-bg_inset-soft_30_ffffff_1x100.png b/var/mongoose/html/img/ui/ui-bg_inset-soft_30_ffffff_1x100.png new file mode 100644 index 0000000..820b017 Binary files /dev/null and b/var/mongoose/html/img/ui/ui-bg_inset-soft_30_ffffff_1x100.png differ diff --git a/var/mongoose/html/img/ui/ui-icons_454545_256x240.png b/var/mongoose/html/img/ui/ui-icons_3d3d3d_256x240.png similarity index 97% rename from var/mongoose/html/img/ui/ui-icons_454545_256x240.png rename to var/mongoose/html/img/ui/ui-icons_3d3d3d_256x240.png index 59bd45b..12b7518 100644 Binary files a/var/mongoose/html/img/ui/ui-icons_454545_256x240.png and b/var/mongoose/html/img/ui/ui-icons_3d3d3d_256x240.png differ diff --git a/var/mongoose/html/img/ui/ui-icons_222222_256x240.png b/var/mongoose/html/img/ui/ui-icons_554e34_256x240.png similarity index 92% rename from var/mongoose/html/img/ui/ui-icons_222222_256x240.png rename to var/mongoose/html/img/ui/ui-icons_554e34_256x240.png index b273ff1..a8f1a7a 100644 Binary files a/var/mongoose/html/img/ui/ui-icons_222222_256x240.png and b/var/mongoose/html/img/ui/ui-icons_554e34_256x240.png differ diff --git a/var/mongoose/html/img/ui/ui-icons_2e83ff_256x240.png b/var/mongoose/html/img/ui/ui-icons_bd7b00_256x240.png similarity index 92% rename from var/mongoose/html/img/ui/ui-icons_2e83ff_256x240.png rename to var/mongoose/html/img/ui/ui-icons_bd7b00_256x240.png index 09d1cdc..e81995d 100644 Binary files a/var/mongoose/html/img/ui/ui-icons_2e83ff_256x240.png and b/var/mongoose/html/img/ui/ui-icons_bd7b00_256x240.png differ diff --git a/var/mongoose/html/img/ui/ui-icons_cd0a0a_256x240.png b/var/mongoose/html/img/ui/ui-icons_cd0a0a_256x240.png deleted file mode 100644 index 2ab019b..0000000 Binary files a/var/mongoose/html/img/ui/ui-icons_cd0a0a_256x240.png and /dev/null differ diff --git a/var/mongoose/html/img/ui/ui-icons_d19405_256x240.png b/var/mongoose/html/img/ui/ui-icons_d19405_256x240.png new file mode 100644 index 0000000..e993eaa Binary files /dev/null and b/var/mongoose/html/img/ui/ui-icons_d19405_256x240.png differ diff --git a/var/mongoose/html/img/ui/ui-icons_888888_256x240.png b/var/mongoose/html/img/ui/ui-icons_eb990f_256x240.png similarity index 92% rename from var/mongoose/html/img/ui/ui-icons_888888_256x240.png rename to var/mongoose/html/img/ui/ui-icons_eb990f_256x240.png index 6d02426..fd0b00a 100644 Binary files a/var/mongoose/html/img/ui/ui-icons_888888_256x240.png and b/var/mongoose/html/img/ui/ui-icons_eb990f_256x240.png differ diff --git a/var/mongoose/html/img/ui/ui-icons_ed9f26_256x240.png b/var/mongoose/html/img/ui/ui-icons_ed9f26_256x240.png new file mode 100644 index 0000000..668e030 Binary files /dev/null and b/var/mongoose/html/img/ui/ui-icons_ed9f26_256x240.png differ diff --git a/var/mongoose/html/img/ui/ui-icons_ffe180_256x240.png b/var/mongoose/html/img/ui/ui-icons_ffe180_256x240.png new file mode 100644 index 0000000..2edc979 Binary files /dev/null and b/var/mongoose/html/img/ui/ui-icons_ffe180_256x240.png differ diff --git a/var/mongoose/html/lib/header.jim b/var/mongoose/html/lib/header.jim index c3d05b4..3c1a5b8 100644 --- a/var/mongoose/html/lib/header.jim +++ b/var/mongoose/html/lib/header.jim @@ -4,6 +4,9 @@ puts { Humax HD[R] Fox T2 + + + } diff --git a/var/mongoose/html/lib/header.shtml b/var/mongoose/html/lib/header.shtml index 44a9a37..121adf5 100644 --- a/var/mongoose/html/lib/header.shtml +++ b/var/mongoose/html/lib/header.shtml @@ -3,6 +3,9 @@ Humax HD[R] Fox T2 + + + diff --git a/var/mongoose/include/db.jim b/var/mongoose/include/db.jim index 50bf722..590c9de 100755 --- a/var/mongoose/include/db.jim +++ b/var/mongoose/include/db.jim @@ -2,6 +2,8 @@ package require sqlite3 +source /mod/var/mongoose/lib/altrow + proc db_info {db_file} { set db [sqlite3.open $db_file] set tables [$db query {SELECT name FROM sqlite_master WHERE type='table' ORDER BY name}] @@ -17,11 +19,11 @@ proc db_info {db_file} { puts "" puts " " foreach column $columns { - puts " " + puts " " } puts " " foreach data $datas { - puts " " + altrow for {set i 1} {$i < [llength $data]} {incr i 2} { puts " " @@ -38,3 +40,4 @@ puts {
[lindex $column 3][lindex $column 3]
[lindex $data $i]