Merge pull request #9 from expectingtofly/fixAPI

Fix api

Author: expectingtofly

TimesRadio/ProtocolHandler.pm

@@ -84,19 +84,19 @@ sub readMetaData {
 			Plugins::TimesRadio::TimesRadioAPI::getOnAir(
 				sub {
 					my $json = shift;
-					main::DEBUGLOG && $log->is_debug && $log->debug('on Air : ' . Dumper($json->{'data'}->{'radioOnAirNow'}));
-					my $duration = str2time( $json->{'data'}->{'radioOnAirNow'}->{'endTime'}) - str2time( $json->{'data'}->{'radioOnAirNow'}->{'startTime'});
+					main::DEBUGLOG && $log->is_debug && $log->debug('on Air : ' . Dumper($json->{'data'}->{'onAirNow'}));
+					my $duration = str2time( $json->{'data'}->{'onAirNow'}->{'endTime'}) - str2time( $json->{'data'}->{'onAirNow'}->{'startTime'});
 
 					my $image;
-					if (scalar @{$json->{'data'}->{'radioOnAirNow'}->{'images'}}) {
-						my @thumbnails = grep { $_->{'width'} == 720 && $_->{'metadata'}[0] eq 'thumbnail' } @{$json->{'data'}->{'radioOnAirNow'}->{'images'}};
+					if (scalar @{$json->{'data'}->{'onAirNow'}->{'images'}}) {
+						my @thumbnails = grep { $_->{'width'} == 720 && $_->{'metadata'}[0] eq 'thumbnail' } @{$json->{'data'}->{'onAirNow'}->{'images'}};
 						$image = $thumbnails[0]->{'url'};
 					}
 
 					my $meta = {
 						type  => 'MP3 (Times Radio)',
-						title =>  $json->{'data'}->{'radioOnAirNow'}->{'title'},
-						artist => $json->{'data'}->{'radioOnAirNow'}->{'description'},
+						title =>  $json->{'data'}->{'onAirNow'}->{'title'},
+						artist => $json->{'data'}->{'onAirNow'}->{'description'},
 						icon  =>  $image,
 						cover =>  $image,
 						duration => $duration,
@@ -107,7 +107,7 @@ sub readMetaData {
 					$song->pluginData( meta  => $meta );
 
 					#when do we need to check again
-					$v->{'metaDataCheck'} = str2time( $json->{'data'}->{'radioOnAirNow'}->{'endTime'}) + 5;
+					$v->{'metaDataCheck'} = str2time( $json->{'data'}->{'onAirNow'}->{'endTime'}) + 5;
 
 					# protection for their api
 
@@ -119,7 +119,7 @@ sub readMetaData {
 
 
 					my $client = ${*$self}{'client'};
-					my $offset =  time() - str2time( $json->{'data'}->{'radioOnAirNow'}->{'startTime'} );
+					my $offset =  time() - str2time( $json->{'data'}->{'onAirNow'}->{'startTime'} );
 
 					main::INFOLOG && $log->is_info && $log->info("Offset is $offset from " . time());
 
@@ -136,7 +136,7 @@ sub readMetaData {
 					$client->playingSong()->duration( $duration ); 
 					$song->track->secs( $duration ); 
 
-					Slim::Music::Info::setCurrentTitle( Slim::Player::Playlist::url($client), $json->{'data'}->{'radioOnAirNow'}->{'title'}, $client ); 
+					Slim::Music::Info::setCurrentTitle( Slim::Player::Playlist::url($client), $json->{'data'}->{'onAirNow'}->{'title'}, $client ); 
 					Slim::Control::Request::notifyFromArray( $client, ['newmetadata'] );
 
 

TimesRadio/RadioFavourites.pm

@@ -46,11 +46,11 @@ sub getStationData {
 			my $json = shift;
 
 			my $result = {
-				title =>  $json->{'data'}->{'radioOnAirNow'}->{'title'},
-				description => $json->{'data'}->{'radioOnAirNow'}->{'description'},
-				image => $json->{'data'}->{'radioOnAirNow'}->{'images'}[0]->{'url'},
-				startTime => str2time($json->{'data'}->{'radioOnAirNow'}->{'startTime'}),
-				endTime   => str2time($json->{'data'}->{'radioOnAirNow'}->{'endTime'}),
+				title =>  $json->{'data'}->{'onAirNow'}->{'title'},
+				description => $json->{'data'}->{'onAirNow'}->{'description'},
+				image => $json->{'data'}->{'onAirNow'}->{'images'}[0]->{'url'},
+				startTime => str2time($json->{'data'}->{'onAirNow'}->{'startTime'}),
+				endTime   => str2time($json->{'data'}->{'onAirNow'}->{'endTime'}),
 				url       => $stationUrl,
 				stationName => $stationName
 			};