xmltv/grab/uk_rt tv_grab_uk_rt,1.49,1.50
Nick Morrott <[email protected]> Sat, 19 Mar 2016 00:07:50 +0000
| Newsgroups | gmane.comp.tv.xmltv.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/xmltv/xmltv/grab/uk_rt
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6316/grab/uk_rt
Modified Files:
tv_grab_uk_rt
Log Message:
Wrap creation of DateTime objects in eval
Index: tv_grab_uk_rt
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/uk_rt/tv_grab_uk_rt,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** tv_grab_uk_rt 18 Mar 2016 17:33:39 -0000 1.49
--- tv_grab_uk_rt 19 Mar 2016 00:07:48 -0000 1.50
***************
*** 2953,2965 ****
# Determine start time with correct UTC offset
! my $start_dt = DateTime->new(
! year => $yyyy,
! month => $mm,
! day => $dd,
! hour => $start_hr,
! minute => $start_mn,
! second => 0,
! time_zone => $tz,
! );
$prog->{start} = "" . $start_dt->ymd('') . $start_dt->hms('') . ' ' . DateTime::TimeZone->offset_as_string($start_dt->offset);
--- 2953,2973 ----
# Determine start time with correct UTC offset
! my $start_dt;
! eval {
! $start_dt = DateTime->new(
! year => $yyyy,
! month => $mm,
! day => $dd,
! hour => $start_hr,
! minute => $start_mn,
! second => 0,
! time_zone => $tz,
! );
! };
! if ($@) {
! t(" A valid programme start time could not be created for '"
! . $prog->{'_title'} . "' ($yyyy$mm$dd $start_hr$start_mn), skipping programme");
! return undef;
! }
$prog->{start} = "" . $start_dt->ymd('') . $start_dt->hms('') . ' ' . DateTime::TimeZone->offset_as_string($start_dt->offset);
***************
*** 2969,2973 ****
# programme to start time
my $dur = DateTime::Duration->new( minutes => $prog->{'_duration_mins'} );
! my $stop_dt = $start_dt + $dur;
# Ensure correct timezone where TZ was explicitly flagged
$stop_dt = $stop_dt->set_time_zone('Europe/London') if (defined $prog->{'_explicit_tz'});
--- 2977,2991 ----
# programme to start time
my $dur = DateTime::Duration->new( minutes => $prog->{'_duration_mins'} );
!
! my $stop_dt;
! eval {
! $stop_dt = $start_dt + $dur;
! };
! if ($@) {
! t(" A valid programme stop time could not be created for '"
! . $prog->{'_title'} . "' ($yyyy$mm$dd $start_hr$start_mn), skipping programme");
! return undef;
! }
!
# Ensure correct timezone where TZ was explicitly flagged
$stop_dt = $stop_dt->set_time_zone('Europe/London') if (defined $prog->{'_explicit_tz'});
***************
*** 3004,3026 ****
my ($chan_start_hr, $chan_start_mn, $chan_stop_hr, $chan_stop_mn) = ($1, $2, $3, $4);
! my $chan_start_dt = DateTime->new(
! year => $yyyy,
! month => $mm,
! day => $dd,
! hour => $chan_start_hr,
! minute => $chan_start_mn,
! second => 0,
! time_zone => 'Europe/London',
! );
! my $chan_stop_dt = DateTime->new(
! year => $yyyy,
! month => $mm,
! day => $dd,
! hour => $chan_stop_hr,
! minute => $chan_stop_mn,
! second => 0,
! time_zone => 'Europe/London',
! );
# Shift channel start/stop times forward by whole days if necessary.
--- 3022,3060 ----
my ($chan_start_hr, $chan_start_mn, $chan_stop_hr, $chan_stop_mn) = ($1, $2, $3, $4);
! my $chan_start_dt;
! eval {
! $chan_start_dt = DateTime->new(
! year => $yyyy,
! month => $mm,
! day => $dd,
! hour => $chan_start_hr,
! minute => $chan_start_mn,
! second => 0,
! time_zone => 'Europe/London',
! );
! };
! if ($@) {
! t(" A valid channel start time could not be created for '"
! . $prog->{'_rt_name'} . "', skipping programme");
! return undef;
! }
! my $chan_stop_dt;
! eval {
! $chan_stop_dt = DateTime->new(
! year => $yyyy,
! month => $mm,
! day => $dd,
! hour => $chan_stop_hr,
! minute => $chan_stop_mn,
! second => 0,
! time_zone => 'Europe/London',
! );
! };
! if ($@) {
! t(" A valid channel stop time could not be created for '"
! . $prog->{'_rt_name'} . "', skipping programme");
! return undef;
! }
# Shift channel start/stop times forward by whole days if necessary.
------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231&iu=/4140