From ff37e7006cea3b14bb108c68d60a97fe15074369 Mon Sep 17 00:00:00 2001 From: Martin Wache Date: Sun, 7 Nov 2010 10:20:00 +0100 Subject: [PATCH 1/5] - first working version of multischedule --- pages/Makefile | 4 +- pages/menu.ecpp | 1 + pages/multischedule.ecpp | 188 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 191 insertions(+), 2 deletions(-) create mode 100644 pages/multischedule.ecpp diff --git a/pages/Makefile b/pages/Makefile index 7e0ab569..c70ecb6b 100644 --- a/pages/Makefile +++ b/pages/Makefile @@ -13,8 +13,8 @@ VDRDIR ?= ../../../.. ### The object files (add further files here): -OBJS = menu.o recordings.o schedule.o screenshot.o timers.o \ - whats_on.o switch_channel.o keypress.o remote.o \ +OBJS = menu.o recordings.o schedule.o multischedule.o screenshot.o \ + timers.o whats_on.o switch_channel.o keypress.o remote.o \ channels_widget.o edit_timer.o error.o pageelems.o tooltip.o \ vlc.o searchtimers.o edit_searchtimer.o searchresults.o \ searchepg.o login.o ibox.o xmlresponse.o play_recording.o \ diff --git a/pages/menu.ecpp b/pages/menu.ecpp index 11590144..dbcb862a 100644 --- a/pages/menu.ecpp +++ b/pages/menu.ecpp @@ -36,6 +36,7 @@ if (!component.empty()) {
><$ tr("What's on?") $> | ><$ trVDR("Schedule") $> + | ><$ trVDR("MultiSchedule") $> | ><$ trVDR("Timers") $> <%cpp> if ( LiveFeatures< features::epgsearch >().Recent() ) { diff --git a/pages/multischedule.ecpp b/pages/multischedule.ecpp new file mode 100644 index 00000000..ab97d9b1 --- /dev/null +++ b/pages/multischedule.ecpp @@ -0,0 +1,188 @@ +<%pre> +#include +#include +#include +#include +#include +#include "exception.h" +#include "livefeatures.h" +#include "setup.h" +#include "tools.h" +#include "epg_events.h" +#include "i18n.h" + +using namespace std; +using namespace vdrlive; + +struct SchedEntry { + string title; + string short_description; + string description; + string start; + string end; + string day; + string epgid; + int start_row; + int row_count; +}; + + +<%args> + int channel = -1; + +<%session scope="global"> +bool logged_in(false); + +<%request scope="page"> + cChannel* Channel; + +<%include>page_init.eh +<%cpp> +if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); + +<%cpp> + pageTitle = trVDR("Schedule"); + + cSchedulesLock schedulesLock; + cSchedules const* schedules = cSchedules::Schedules( schedulesLock ); + + ReadLock channelsLock( Channels ); + if ( !channelsLock ) + throw HtmlError( tr("Couldn't aquire access to channels, please try again later.") ); + + // cChannel* Channel; (see %request above) + if ( channel > 0 ) { + Channel = Channels.GetByNumber( channel ); + } + else { + if (cDevice::CurrentChannel()) { + Channel = Channels.GetByNumber(cDevice::CurrentChannel()); + } + else { + Channel = Channels.Get( Channels.GetNextNormal( -1 ) ); + } + } + if ( Channel == 0 ) + throw HtmlError( tr("Couldn't find channel or no channels available. Maybe you mistyped your request?") ); + + cSchedule const* Schedule = schedules->GetSchedule( Channel ); + +<& pageelems.doc_type &> + + + VDR Live - <$ pageTitle $> + <& pageelems.stylesheets &> + <& pageelems.ajax_js &> + + + <& pageelems.logo &> + <& menu active=("multischedule") component=("schedule.channel_selection") &> +
+<%cpp> + if ( Schedule == 0 ) { + + <$ tr("No schedules available for this channel") $>. +<%cpp> + } + else { + time_t now = time(NULL) - ::Setup.EPGLinger * 60; + time_t sched_start = 3600 * (now / 3600); // start at a full hour + // tChannelID channel_id(Channel->GetChannelID()); + // int evntNr = 0; +#define MAX_CHANNELS 5 +#define MAX_EVENTS 200 +#define MINUTES_PER_ROW 6 + SchedEntry table[MAX_CHANNELS][MAX_EVENTS]; + int prev_row = -1; + int count = 0; + for (const cEvent *Event = Schedule->Events()->First(); Event && count < MAX_EVENTS; + Event = Schedule->Events()->Next(Event)) { + if (Event->EndTime() <= sched_start ) + continue; + + EpgInfoPtr epgEvent = EpgEvents::CreateEpgInfo(Channel, Event); + SchedEntry &en=table[0][count]; + + en.title = epgEvent->Title(); + en.short_description = epgEvent->ShortDescr(); + en.description = epgEvent->LongDescr(); + en.start = epgEvent->StartTime(tr("%I:%M %p")); + en.end = epgEvent->EndTime(tr("%I:%M %p")); + en.day = epgEvent->StartTime(tr("%A, %b %d %Y")); + en.epgid = EpgEvents::EncodeDomId(Channel->GetChannelID(), Event->EventID()); + // string strEventID = lexical_cast(Event->EventID(); + + en.start_row = prev_row > 0 ? prev_row : 0; + prev_row = en.start_row; + int end_time = Schedule->Events()->Next(Event) ? + Schedule->Events()->Next(Event)->StartTime() : + Event->EndTime(); + int next_event_start_row = (end_time - sched_start) / 60 / MINUTES_PER_ROW; + en.row_count = next_event_start_row - en.start_row; + if ( en.row_count < 2 ) + en.row_count = 2; + prev_row = en.start_row + en.row_count; + count++; + }; + + +<%cpp> + time_t sched_end = sched_start + 60 * 60 * 12; // 12 hr + int sched_end_row = ( sched_end - sched_start ) / 60 / MINUTES_PER_ROW; + int cur_event = 0; + for (int row = 0 ; row < sched_end_row; row++ ) + { + + + + +<%cpp> + if ( table[0][cur_event].start_row == row ) + { + SchedEntry &en=table[0][cur_event]; + bool truncated = false; + + +<%cpp> + cur_event++; + } + + +<%cpp> + } + +
+<%cpp> + if ( (sched_start + row * 60 * MINUTES_PER_ROW ) % 3600 == 0 ) + { + + <$ FormatDateTime( tr("%I:%M %p"), sched_start + row * 60 * MINUTES_PER_ROW ) $> +<%cpp> + } + else + { + +   +<%cpp> + } + + +
" + tr("Click to view details.")) &>><$ en.title $>
<$ en.short_description.empty() ? " " : en.short_description $><$ en.start + "-" + en.end $>
+<%cpp> + } + +
+ + +<%include>page_exit.eh + +<%def channel_selection> +
+ + + <& channels_widget name=("channel") selected=(Channel ? *Channel->GetChannelID().ToString() : "") onchange=("document.forms.channels.submit()") &> + <& pageelems.ajax_action_href action="switch_channel" tip=(tr("Switch to this channel.")) param=(Channel->GetChannelID()) image="zap.png" alt="" &> + <& pageelems.vlc_stream_channel channelId=(Channel->GetChannelID()) &> + +
+ From 350ebad826ece189072d19b2dc9224ffc8e4aced Mon Sep 17 00:00:00 2001 From: Martin Wache Date: Sat, 20 Nov 2010 13:07:12 +0100 Subject: [PATCH 2/5] - some fixes and improvements to multischedule --- css/styles.css | 70 ++++++++++++ pages/menu.ecpp | 1 + pages/multischedule.ecpp | 231 +++++++++++++++++++++++++++++---------- tools.cpp | 1 + 4 files changed, 243 insertions(+), 60 deletions(-) diff --git a/css/styles.css b/css/styles.css index 4fd23b10..35b21194 100644 --- a/css/styles.css +++ b/css/styles.css @@ -867,6 +867,76 @@ table.listing a { font-weight: bold; } +/* ################################## + # table schedule + # (this is used for the MultiSchedule) + ################################## +*/ + +table.mschedule { + padding: 0px; + margin: 0px; +} + +table.mschedule tr { + height: 12px; +} + +table.mschedule tr td.event { + background: transparent url(img/bg_line.png) bottom repeat-x; + border-bottom: 1px solid #C0C1DA; +} + +table.mschedule tr.odd td.time { + background-color: #D0D0ff; +} + +table.mschedule tr.even td.time { + background-color: #ffffff; +} + +table.mschedule tr.current_row td.time { + background-color: #ffB0B0; +} + +table.mschedule tr td.leftcol { + padding-left: 7px; + padding-right: 5px; +} + +table.mschedule div.content1 { + min-width: 20em; + max-width: 30em; +} + +table.mschedule div.tools1 { + float: right; +} + +table.mschedule div.start { + float: left; +} + +table.mschedule tr td div.title { + padding: 3px; + clear: both; +} + +table.mschedule tr td div.short { + clear: both; + overflow: hidden; +} + +table.mschedule tr td div.description { + overflow: hidden; + clear: both; +} + +table.mschedule a { + color: black; + font-weight: bold; +} + /* ############################## # Blue Background Thingy diff --git a/pages/menu.ecpp b/pages/menu.ecpp index dbcb862a..5721e421 100644 --- a/pages/menu.ecpp +++ b/pages/menu.ecpp @@ -86,6 +86,7 @@ if (!component.empty()) {
<& menu.component current=("whats_on") &> <& menu.component current=("schedule") &> + <& menu.component current=("multischedule") &> <& menu.component current=("timers") &> <%cpp> if (LiveFeatures< features::epgsearch >().Recent()) { diff --git a/pages/multischedule.ecpp b/pages/multischedule.ecpp index ab97d9b1..3d207eca 100644 --- a/pages/multischedule.ecpp +++ b/pages/multischedule.ecpp @@ -18,17 +18,19 @@ struct SchedEntry { string title; string short_description; string description; + string description_trunc; string start; string end; string day; string epgid; + bool truncated; int start_row; int row_count; }; <%args> - int channel = -1; + int channel = 1; <%session scope="global"> bool logged_in(false); @@ -39,33 +41,10 @@ bool logged_in(false); <%include>page_init.eh <%cpp> if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); - -<%cpp> - pageTitle = trVDR("Schedule"); - - cSchedulesLock schedulesLock; - cSchedules const* schedules = cSchedules::Schedules( schedulesLock ); - - ReadLock channelsLock( Channels ); - if ( !channelsLock ) - throw HtmlError( tr("Couldn't aquire access to channels, please try again later.") ); - - // cChannel* Channel; (see %request above) - if ( channel > 0 ) { - Channel = Channels.GetByNumber( channel ); - } - else { - if (cDevice::CurrentChannel()) { - Channel = Channels.GetByNumber(cDevice::CurrentChannel()); - } - else { - Channel = Channels.Get( Channels.GetNextNormal( -1 ) ); - } - } - if ( Channel == 0 ) - throw HtmlError( tr("Couldn't find channel or no channels available. Maybe you mistyped your request?") ); - - cSchedule const* Schedule = schedules->GetSchedule( Channel ); +pageTitle = trVDR("Schedule"); + Channel = Channels.GetByNumber( channel ); + if (!Channel) + throw HtmlError( tr("Error didn't find the channel") ); <& pageelems.doc_type &> @@ -76,32 +55,64 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); <& pageelems.logo &> - <& menu active=("multischedule") component=("schedule.channel_selection") &> + <& menu active=("multischedule") component=("multischedule.channel_selection") &>
<%cpp> - if ( Schedule == 0 ) { - - <$ tr("No schedules available for this channel") $>. -<%cpp> - } - else { + + cSchedulesLock schedulesLock; + cSchedules const* schedules = cSchedules::Schedules( schedulesLock ); + + ReadLock channelsLock( Channels ); + if ( !channelsLock ) + throw HtmlError( tr("Couldn't aquire access to channels, please try again later.") ); +{ time_t now = time(NULL) - ::Setup.EPGLinger * 60; time_t sched_start = 3600 * (now / 3600); // start at a full hour // tChannelID channel_id(Channel->GetChannelID()); // int evntNr = 0; -#define MAX_CHANNELS 5 +#define MAX_CHANNELS 3 #define MAX_EVENTS 200 -#define MINUTES_PER_ROW 6 +#define MINUTES_PER_ROW 5 +#define CHARACTERS_PER_ROW 30 SchedEntry table[MAX_CHANNELS][MAX_EVENTS]; + int chan = 0; + int count[ MAX_CHANNELS ]; + string channel_names[ MAX_CHANNELS]; + for ( chan = 0; chanEvents()->First(); Event && count < MAX_EVENTS; + count[ chan ] = 0; + + Channel = Channels.GetByNumber( channel+chan ); + if ( ! Channel ) + continue; + if ( Channel->GroupSep() || Channel->Name() == '\0' ) + continue; + channel_names[ chan ] = Channel->Name(); + + cSchedule const* Schedule = schedules->GetSchedule( Channel ); + if ( ! Schedule ) + continue; + for (const cEvent *Event = Schedule->Events()->First(); Event && count[chan] < MAX_EVENTS; Event = Schedule->Events()->Next(Event)) { if (Event->EndTime() <= sched_start ) continue; EpgInfoPtr epgEvent = EpgEvents::CreateEpgInfo(Channel, Event); - SchedEntry &en=table[0][count]; + if ( prev_row < 0 && Event->StartTime() > sched_start + MINUTES_PER_ROW ) + { + // insert dummy event at start + SchedEntry &en=table[chan][count[chan]]; + int event_start_row = (Event->StartTime() - sched_start) / 60 / MINUTES_PER_ROW; + en.start_row = 0; + en.row_count = event_start_row; + // no title and no start time = dummy event + en.title = ""; + en.start = ""; + prev_row = en.start_row + en.row_count; + count[chan]++; + } + SchedEntry &en=table[chan][count[chan]]; en.title = epgEvent->Title(); en.short_description = epgEvent->ShortDescr(); @@ -113,31 +124,71 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); // string strEventID = lexical_cast(Event->EventID(); en.start_row = prev_row > 0 ? prev_row : 0; - prev_row = en.start_row; int end_time = Schedule->Events()->Next(Event) ? Schedule->Events()->Next(Event)->StartTime() : Event->EndTime(); int next_event_start_row = (end_time - sched_start) / 60 / MINUTES_PER_ROW; en.row_count = next_event_start_row - en.start_row; - if ( en.row_count < 2 ) - en.row_count = 2; + if ( en.row_count < 1 ) + en.row_count = 1; prev_row = en.start_row + en.row_count; - count++; - }; + + // truncate description if too long + en.truncated=false; + en.description_trunc=StringWordTruncate( en.description, + CHARACTERS_PER_ROW*(en.row_count-2), + en.truncated ); + + + + count[chan]++; + }; + } - +
<%cpp> time_t sched_end = sched_start + 60 * 60 * 12; // 12 hr int sched_end_row = ( sched_end - sched_start ) / 60 / MINUTES_PER_ROW; - int cur_event = 0; - for (int row = 0 ; row < sched_end_row; row++ ) + int cur_event[ MAX_CHANNELS ]; + for (int i=0;i + + + +<%cpp> + for ( int channel = 0; channel< MAX_CHANNELS ; channel++) + { + + + +<%cpp> + } + + +<%cpp> + bool odd=true; + for (int row = 0 ; row < sched_end_row; row++ ) { + int minutes= ( (sched_start + row * 60 * MINUTES_PER_ROW ) % 3600 ) / 60; + string row_class; + if ( minutes == 0 ) + { + // full hour, swap odd/even + odd = !odd; + }; + if ( (sched_start + row * 60 * MINUTES_PER_ROW ) <= now && + (sched_start + (row+1) * 60 * MINUTES_PER_ROW ) > now ) + { + row_class +=" current_row "; + } + row_class += odd ? " odd " : " even "; - - + <%cpp> - if ( table[0][cur_event].start_row == row ) - { - SchedEntry &en=table[0][cur_event]; - bool truncated = false; + for ( int channel = 0; channel< MAX_CHANNELS ; channel++) + { + // output spacer column - + <%cpp> - cur_event++; - } + if ( table[channel][cur_event[channel]].start_row != row ) + // no new event in this channel, skip it + continue; + + SchedEntry &en=table[channel][cur_event[channel]]; + if (en.title.empty() && en.start.empty() ) + { + // empty dummy event + + +<%cpp> + cur_event[channel]++; + continue; + + } + // output an event cell + + +<%cpp> + // move to next event for this channel + cur_event[channel]++; + } <%cpp> diff --git a/tools.cpp b/tools.cpp index bda91f08..e8589d7e 100644 --- a/tools.cpp +++ b/tools.cpp @@ -114,6 +114,7 @@ namespace vdrlive { { if (input.length() <= maxLen) { + truncated = false; return input; } truncated = true; From 56f963c0a702faa5f2de9b912a8c348b6a00f486 Mon Sep 17 00:00:00 2001 From: Martin Wache Date: Sat, 20 Nov 2010 17:53:31 +0100 Subject: [PATCH 3/5] - remove arrays introduce std::list, currently crashes --- pages/multischedule.ecpp | 152 +++++++++++++++++++-------------------- 1 file changed, 74 insertions(+), 78 deletions(-) diff --git a/pages/multischedule.ecpp b/pages/multischedule.ecpp index 3d207eca..deb28668 100644 --- a/pages/multischedule.ecpp +++ b/pages/multischedule.ecpp @@ -1,4 +1,5 @@ <%pre> +#include #include #include #include @@ -65,93 +66,86 @@ pageTitle = trVDR("Schedule"); ReadLock channelsLock( Channels ); if ( !channelsLock ) throw HtmlError( tr("Couldn't aquire access to channels, please try again later.") ); -{ - time_t now = time(NULL) - ::Setup.EPGLinger * 60; - time_t sched_start = 3600 * (now / 3600); // start at a full hour - // tChannelID channel_id(Channel->GetChannelID()); - // int evntNr = 0; + + time_t now = time(NULL) - ::Setup.EPGLinger * 60; + time_t sched_start = 3600 * (now / 3600); // start at a full hour + time_t sched_end = sched_start + 60 * 60 * 12; // 12 hr #define MAX_CHANNELS 3 -#define MAX_EVENTS 200 #define MINUTES_PER_ROW 5 #define CHARACTERS_PER_ROW 30 - SchedEntry table[MAX_CHANNELS][MAX_EVENTS]; - int chan = 0; - int count[ MAX_CHANNELS ]; - string channel_names[ MAX_CHANNELS]; - for ( chan = 0; chan table[MAX_CHANNELS]; + string channel_names[ MAX_CHANNELS]; + for ( int chan = 0; chanGroupSep() || Channel->Name() == '\0' ) - continue; - channel_names[ chan ] = Channel->Name(); + Channel = Channels.GetByNumber( channel+chan ); + if ( ! Channel ) + continue; + if ( Channel->GroupSep() || Channel->Name() == '\0' ) + continue; + channel_names[ chan ] = Channel->Name(); - cSchedule const* Schedule = schedules->GetSchedule( Channel ); - if ( ! Schedule ) - continue; - for (const cEvent *Event = Schedule->Events()->First(); Event && count[chan] < MAX_EVENTS; - Event = Schedule->Events()->Next(Event)) { - if (Event->EndTime() <= sched_start ) - continue; + cSchedule const* Schedule = schedules->GetSchedule( Channel ); + if ( ! Schedule ) + continue; + for (const cEvent *Event = Schedule->Events()->First(); Event ; + Event = Schedule->Events()->Next(Event)) + { + if (Event->EndTime() <= sched_start ) + continue; + if (Event->StartTime() >= sched_end ) + break; - EpgInfoPtr epgEvent = EpgEvents::CreateEpgInfo(Channel, Event); - if ( prev_row < 0 && Event->StartTime() > sched_start + MINUTES_PER_ROW ) - { - // insert dummy event at start - SchedEntry &en=table[chan][count[chan]]; - int event_start_row = (Event->StartTime() - sched_start) / 60 / MINUTES_PER_ROW; - en.start_row = 0; - en.row_count = event_start_row; - // no title and no start time = dummy event - en.title = ""; - en.start = ""; - prev_row = en.start_row + en.row_count; - count[chan]++; - } - SchedEntry &en=table[chan][count[chan]]; + EpgInfoPtr epgEvent = EpgEvents::CreateEpgInfo(Channel, Event); + if ( prev_row < 0 && Event->StartTime() > sched_start + MINUTES_PER_ROW ) + { + // insert dummy event at start + table[ chan ].push_back( SchedEntry() ); + SchedEntry &en=table[ chan ].back(); + int event_start_row = (Event->StartTime() - sched_start) / 60 / MINUTES_PER_ROW; + en.start_row = 0; + en.row_count = event_start_row; + // no title and no start time = dummy event + en.title = ""; + en.start = ""; + prev_row = en.start_row + en.row_count; + } + table[ chan ].push_back( SchedEntry() ); + SchedEntry &en=table[chan].back(); + + en.title = epgEvent->Title(); + en.short_description = epgEvent->ShortDescr(); + en.description = epgEvent->LongDescr(); + en.start = epgEvent->StartTime(tr("%I:%M %p")); + en.end = epgEvent->EndTime(tr("%I:%M %p")); + en.day = epgEvent->StartTime(tr("%A, %b %d %Y")); + en.epgid = EpgEvents::EncodeDomId(Channel->GetChannelID(), Event->EventID()); + // string strEventID = lexical_cast(Event->EventID(); - en.title = epgEvent->Title(); - en.short_description = epgEvent->ShortDescr(); - en.description = epgEvent->LongDescr(); - en.start = epgEvent->StartTime(tr("%I:%M %p")); - en.end = epgEvent->EndTime(tr("%I:%M %p")); - en.day = epgEvent->StartTime(tr("%A, %b %d %Y")); - en.epgid = EpgEvents::EncodeDomId(Channel->GetChannelID(), Event->EventID()); - // string strEventID = lexical_cast(Event->EventID(); + en.start_row = prev_row > 0 ? prev_row : 0; + int end_time = Schedule->Events()->Next(Event) ? + Schedule->Events()->Next(Event)->StartTime() : + Event->EndTime(); + int next_event_start_row = (end_time - sched_start) / 60 / MINUTES_PER_ROW; + en.row_count = next_event_start_row - en.start_row; + if ( en.row_count < 1 ) + en.row_count = 1; + prev_row = en.start_row + en.row_count; - en.start_row = prev_row > 0 ? prev_row : 0; - int end_time = Schedule->Events()->Next(Event) ? - Schedule->Events()->Next(Event)->StartTime() : - Event->EndTime(); - int next_event_start_row = (end_time - sched_start) / 60 / MINUTES_PER_ROW; - en.row_count = next_event_start_row - en.start_row; - if ( en.row_count < 1 ) - en.row_count = 1; - prev_row = en.start_row + en.row_count; - - // truncate description if too long - en.truncated=false; - en.description_trunc=StringWordTruncate( en.description, - CHARACTERS_PER_ROW*(en.row_count-2), - en.truncated ); + // truncate description if too long + en.truncated=false; + en.description_trunc=StringWordTruncate( en.description, + CHARACTERS_PER_ROW*(en.row_count-2), + en.truncated ); - count[chan]++; - }; + }; }
<$ tr("Time") $>
  
<$ channel_names[channel] $>
 
+
<%cpp> - if ( (sched_start + row * 60 * MINUTES_PER_ROW ) % 3600 == 0 ) + if ( minutes == 0 ) { <$ FormatDateTime( tr("%I:%M %p"), sched_start + row * 60 * MINUTES_PER_ROW ) $> @@ -148,20 +199,80 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");   <%cpp> - } + } -
" + tr("Click to view details.")) &>><$ en.title $>
<$ en.short_description.empty() ? " " : en.short_description $><$ en.start + "-" + en.end $>
   + +
+
+ <& pageelems.event_timer epgid=(en.epgid) &> +<%cpp> + if (LiveFeatures().Recent() ) { + + " alt="" <& tooltip.hint text=(tr("Search for repeats.")) &>> +<%cpp> + } else { + <%cpp> + } + + <& pageelems.imdb_info_href title=(en.title) &> +
<$ en.start $>
+
<& tooltip.display domId=en.epgid &>><$ en.title $>
+<%cpp> + if ( en.row_count>2 && !en.short_description.empty() ) + { + +
<$ en.short_description.empty() ? " " : en.short_description $>
+<%cpp> + } + if ( en.row_count>3 && ! en.description_trunc.empty() ) + { + +
<$en.description_trunc$>... +<%cpp> + if ( en.truncated ) + { + + <& tooltip.display domId=en.epgid &>> <$ tr("more") $> +<%cpp> + } + +
+<%cpp> + + } + + +
<%cpp> - time_t sched_end = sched_start + 60 * 60 * 12; // 12 hr - int sched_end_row = ( sched_end - sched_start ) / 60 / MINUTES_PER_ROW; - int cur_event[ MAX_CHANNELS ]; - for (int i=0;i @@ -168,6 +162,10 @@ pageTitle = trVDR("Schedule"); <%cpp> bool odd=true; + int sched_end_row = ( sched_end - sched_start ) / 60 / MINUTES_PER_ROW; + std::list::iterator cur_event[ MAX_CHANNELS ]; + for (int i=0;i <%cpp> - if ( table[channel][cur_event[channel]].start_row != row ) + if ( cur_event[channel] != table[channel].end() + && cur_event[channel]->start_row != row ) // no new event in this channel, skip it continue; - SchedEntry &en=table[channel][cur_event[channel]]; + SchedEntry &en=*cur_event[channel]; if (en.title.empty() && en.start.empty() ) { // empty dummy event @@ -221,7 +220,7 @@ pageTitle = trVDR("Schedule"); <%cpp> - cur_event[channel]++; + ++cur_event[channel]; continue; } @@ -271,7 +270,7 @@ pageTitle = trVDR("Schedule"); <%cpp> // move to next event for this channel - cur_event[channel]++; + ++cur_event[channel]; } @@ -279,9 +278,6 @@ pageTitle = trVDR("Schedule"); }
<$ tr("Time") $>
 
-<%cpp> - } -
From 58d45a59453e5ceb597507bfba27afaada5ad25e Mon Sep 17 00:00:00 2001 From: martin Date: Sun, 21 Nov 2010 18:30:58 +0100 Subject: [PATCH 4/5] - added channel group selection, various fixes --- css/styles.css | 6 +- pages/multischedule.ecpp | 130 ++++++++++++++++++++++++++++----------- 2 files changed, 100 insertions(+), 36 deletions(-) diff --git a/css/styles.css b/css/styles.css index 35b21194..50908443 100644 --- a/css/styles.css +++ b/css/styles.css @@ -887,6 +887,10 @@ table.mschedule tr td.event { border-bottom: 1px solid #C0C1DA; } +table.mschedule tr td.has_timer { + background-color: #FFE0E0; +} + table.mschedule tr.odd td.time { background-color: #D0D0ff; } @@ -905,7 +909,7 @@ table.mschedule tr td.leftcol { } table.mschedule div.content1 { - min-width: 20em; + min-width: 10em; max-width: 30em; } diff --git a/pages/multischedule.ecpp b/pages/multischedule.ecpp index deb28668..bf2a9685 100644 --- a/pages/multischedule.ecpp +++ b/pages/multischedule.ecpp @@ -9,6 +9,7 @@ #include "livefeatures.h" #include "setup.h" #include "tools.h" +#include "timers.h" #include "epg_events.h" #include "i18n.h" @@ -25,10 +26,12 @@ struct SchedEntry { string day; string epgid; bool truncated; + bool has_timer; int start_row; int row_count; }; + std::vector channel_groups_names; <%args> int channel = 1; @@ -37,15 +40,50 @@ struct SchedEntry { bool logged_in(false); <%request scope="page"> - cChannel* Channel; + int channel_group=0; <%include>page_init.eh <%cpp> if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); pageTitle = trVDR("Schedule"); - Channel = Channels.GetByNumber( channel ); - if (!Channel) - throw HtmlError( tr("Error didn't find the channel") ); + + ReadLock channelsLock( Channels ); + if ( !channelsLock ) + throw HtmlError( tr("Couldn't aquire access to channels, please try again later.") ); + +#define MAX_CHANNELS 5 +#define MINUTES_PER_ROW 5 +#define CHARACTERS_PER_ROW 30 + + // build the groups of channels to display + std::vector< std::vector > channel_groups_numbers; + channel_groups_names.clear(); + int cur_group_count=0; + for ( cChannel *listChannel = Channels.First(); listChannel; listChannel = Channels.Next( listChannel ) ) + { + if ( listChannel->GroupSep() || *listChannel->Name() == '\0' ) + continue; + + if ( cur_group_count==0 ) + { + // first entry in this group + channel_groups_names.push_back( std::string() ); + channel_groups_numbers.push_back( std::vector( MAX_CHANNELS) ); + } + else channel_groups_names.back() += " - "; + + channel_groups_names.back() += std::string( listChannel->Name() ); + channel_groups_numbers.back()[ cur_group_count ] = listChannel->Number(); + + cur_group_count++; + if ( cur_group_count >= MAX_CHANNELS ) + // we need a new group next round + cur_group_count = 0; + } + if ( channel >= channel_groups_numbers.size() ) + channel = channel_groups_numbers.size()-1; + channel_group = channel; + <& pageelems.doc_type &> @@ -59,50 +97,53 @@ pageTitle = trVDR("Schedule"); <& menu active=("multischedule") component=("multischedule.channel_selection") &>
<%cpp> - cSchedulesLock schedulesLock; cSchedules const* schedules = cSchedules::Schedules( schedulesLock ); - +#if 0 ReadLock channelsLock( Channels ); if ( !channelsLock ) throw HtmlError( tr("Couldn't aquire access to channels, please try again later.") ); - +#endif time_t now = time(NULL) - ::Setup.EPGLinger * 60; time_t sched_start = 3600 * (now / 3600); // start at a full hour - time_t sched_end = sched_start + 60 * 60 * 12; // 12 hr -#define MAX_CHANNELS 3 -#define MINUTES_PER_ROW 5 -#define CHARACTERS_PER_ROW 30 + time_t sched_end = sched_start + 60 * 60 * 24; // 12 hr + int sched_end_row = ( sched_end - sched_start ) / 60 / MINUTES_PER_ROW; std::list table[MAX_CHANNELS]; string channel_names[ MAX_CHANNELS]; - for ( int chan = 0; chan= channel_groups_numbers.size() ) + channel = channel_groups_numbers.size()-1; + //for ( int chan = 0; chanGroupSep() || Channel->Name() == '\0' ) continue; - channel_names[ chan ] = Channel->Name(); + channel_names[ j ] = Channel->Name(); cSchedule const* Schedule = schedules->GetSchedule( Channel ); if ( ! Schedule ) continue; - for (const cEvent *Event = Schedule->Events()->First(); Event ; - Event = Schedule->Events()->Next(Event)) + for (const cEvent *Event = Schedule->Events()->First(); Event; + Event = Schedule->Events()->Next(Event) ) { if (Event->EndTime() <= sched_start ) continue; if (Event->StartTime() >= sched_end ) - break; + continue; EpgInfoPtr epgEvent = EpgEvents::CreateEpgInfo(Channel, Event); if ( prev_row < 0 && Event->StartTime() > sched_start + MINUTES_PER_ROW ) { // insert dummy event at start - table[ chan ].push_back( SchedEntry() ); - SchedEntry &en=table[ chan ].back(); + table[ j ].push_back( SchedEntry() ); + SchedEntry &en=table[ j ].back(); int event_start_row = (Event->StartTime() - sched_start) / 60 / MINUTES_PER_ROW; en.start_row = 0; en.row_count = event_start_row; @@ -111,8 +152,8 @@ pageTitle = trVDR("Schedule"); en.start = ""; prev_row = en.start_row + en.row_count; } - table[ chan ].push_back( SchedEntry() ); - SchedEntry &en=table[chan].back(); + table[ j ].push_back( SchedEntry() ); + SchedEntry &en=table[j].back(); en.title = epgEvent->Title(); en.short_description = epgEvent->ShortDescr(); @@ -121,7 +162,7 @@ pageTitle = trVDR("Schedule"); en.end = epgEvent->EndTime(tr("%I:%M %p")); en.day = epgEvent->StartTime(tr("%A, %b %d %Y")); en.epgid = EpgEvents::EncodeDomId(Channel->GetChannelID(), Event->EventID()); - // string strEventID = lexical_cast(Event->EventID(); + en.has_timer = LiveTimerManager().GetTimer(Event->EventID(), Channel->GetChannelID() ) != 0; en.start_row = prev_row > 0 ? prev_row : 0; int end_time = Schedule->Events()->Next(Event) ? @@ -141,7 +182,18 @@ pageTitle = trVDR("Schedule"); - }; + }; + if ( table[ j ].begin() == table[ j ].end() ) + { + // no entries... create a single dummy entry + table[ j ].push_back( SchedEntry() ); + SchedEntry &en=table[ j ].back(); + en.start_row = 0; + en.row_count = sched_end_row; + // no title and no start time = dummy event + en.title = ""; + en.start = ""; + } } @@ -154,7 +206,7 @@ pageTitle = trVDR("Schedule"); for ( int channel = 0; channel< MAX_CHANNELS ; channel++) { - + <%cpp> } @@ -162,7 +214,6 @@ pageTitle = trVDR("Schedule"); <%cpp> bool odd=true; - int sched_end_row = ( sched_end - sched_start ) / 60 / MINUTES_PER_ROW; std::list::iterator cur_event[ MAX_CHANNELS ]; for (int i=0;i <%cpp> - if ( cur_event[channel] != table[channel].end() - && cur_event[channel]->start_row != row ) + if ( cur_event[channel] == table[channel].end() + || cur_event[channel]->start_row != row ) // no new event in this channel, skip it continue; @@ -226,7 +277,7 @@ pageTitle = trVDR("Schedule"); } // output an event cell - <%cpp> // move to next event for this channel @@ -286,10 +336,20 @@ pageTitle = trVDR("Schedule"); <%def channel_selection> - - <& channels_widget name=("channel") selected=(Channel ? *Channel->GetChannelID().ToString() : "") onchange=("document.forms.channels.submit()") &> - <& pageelems.ajax_action_href action="switch_channel" tip=(tr("Switch to this channel.")) param=(Channel->GetChannelID()) image="zap.png" alt="" &> - <& pageelems.vlc_stream_channel channelId=(Channel->GetChannelID()) &> + + +% // <& pageelems.ajax_action_href action="switch_channel" tip=(tr("Switch to this channel.")) param=(Channel->GetChannelID()) image="zap.png" alt="" &> +% // <& pageelems.vlc_stream_channel channelId=(Channel->GetChannelID()) &> From 78bf26e22bb4d921d0270e64974daceb78130019 Mon Sep 17 00:00:00 2001 From: martin Date: Fri, 31 Dec 2010 13:34:36 +0100 Subject: [PATCH 5/5] - add ability to select start time --- pages/multischedule.ecpp | 76 ++++++++++++++++++++++++++++++++++------ 1 file changed, 65 insertions(+), 11 deletions(-) diff --git a/pages/multischedule.ecpp b/pages/multischedule.ecpp index bf2a9685..bf05fa6b 100644 --- a/pages/multischedule.ecpp +++ b/pages/multischedule.ecpp @@ -32,15 +32,19 @@ struct SchedEntry { }; std::vector channel_groups_names; + std::vector times_names; + std::vector times_start; <%args> - int channel = 1; + unsigned int channel = 0; + unsigned int time_para = 0; <%session scope="global"> bool logged_in(false); <%request scope="page"> - int channel_group=0; + unsigned int channel_group=0; + unsigned int time_selected=0; <%include>page_init.eh <%cpp> @@ -52,6 +56,8 @@ pageTitle = trVDR("Schedule"); throw HtmlError( tr("Couldn't aquire access to channels, please try again later.") ); #define MAX_CHANNELS 5 +#define MAX_DAYS 3 +#define MAX_HOURS 8 #define MINUTES_PER_ROW 5 #define CHARACTERS_PER_ROW 30 @@ -83,7 +89,45 @@ pageTitle = trVDR("Schedule"); if ( channel >= channel_groups_numbers.size() ) channel = channel_groups_numbers.size()-1; channel_group = channel; +{ + // build time list + times_names.clear(); + times_start.clear(); + + // calculate time of midnight (localtime) and convert back to GMT + time_t now = time(NULL); + time_t now_local = time(NULL); + struct tm tm_r; + if ( localtime_r( &now_local, &tm_r ) == 0 ) { + ostringstream builder; + builder << "cannot represent timestamp " << now_local << " as local time"; + throw runtime_error( builder.str() ); + } + tm_r.tm_hour=0; + tm_r.tm_min=0; + tm_r.tm_sec=0; + time_t midnight = mktime( &tm_r ); + // default is now rounded to full hour + times_names.push_back( tr("Now") ); + times_start.push_back( 3600 * ( now /3600 ) ); + + int i =0; + // skip allready passed times + while ( now>midnight+MAX_HOURS*3600*i) + i++; + + for (; i<4*MAX_DAYS ; i++ ) + { + times_names.push_back(FormatDateTime( tr("%A, %x"), midnight + MAX_HOURS*3600*i) + +std::string(" ")+ FormatDateTime( tr("%I:%M %p"), midnight + MAX_HOURS*3600*i) ); + //times_names.push_back("today 0:00"); + times_start.push_back( midnight + MAX_HOURS*3600*i ); + } + if ( time_para >= times_names.size() ) + time_para = times_names.size()-1; + time_selected=time_para; +} <& pageelems.doc_type &> @@ -99,14 +143,12 @@ pageTitle = trVDR("Schedule"); <%cpp> cSchedulesLock schedulesLock; cSchedules const* schedules = cSchedules::Schedules( schedulesLock ); -#if 0 - ReadLock channelsLock( Channels ); - if ( !channelsLock ) - throw HtmlError( tr("Couldn't aquire access to channels, please try again later.") ); -#endif - time_t now = time(NULL) - ::Setup.EPGLinger * 60; - time_t sched_start = 3600 * (now / 3600); // start at a full hour - time_t sched_end = sched_start + 60 * 60 * 24; // 12 hr + + time_t now = time(NULL); + if ( time_para >= times_start.size() ) + time_para = times_start.size()-1; + time_t sched_start = times_start[ time_para ]; + time_t sched_end = sched_start + 60 * 60 * MAX_HOURS; int sched_end_row = ( sched_end - sched_start ) / 60 / MINUTES_PER_ROW; std::list table[MAX_CHANNELS]; string channel_names[ MAX_CHANNELS]; @@ -338,7 +380,7 @@ pageTitle = trVDR("Schedule"); + + % // <& pageelems.ajax_action_href action="switch_channel" tip=(tr("Switch to this channel.")) param=(Channel->GetChannelID()) image="zap.png" alt="" &>
<$ channel_names[channel] $>
<$ StringEscapeAndBreak(channel_names[channel]) $>
 
  + " rowspan="<$ en.row_count $>">
<& pageelems.event_timer epgid=(en.epgid) &> @@ -261,12 +312,11 @@ pageTitle = trVDR("Schedule"); <%cpp> } -
+ <%cpp> - } - +