xmltv/grab/uk_atlas CHANGELOG, 1.4, 1.5 FAQ, 1.1, 1.2 INSTALL, 1.1, 1.2 tv_grab_uk_atlas, 1.8, 1.9 atlasAPIkey, 1.1, NONE
Geoff <[email protected]>
| Newsgroups | gmane.comp.tv.xmltv.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/xmltv/xmltv/grab/uk_atlas
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6183/grab/uk_atlas
Modified Files:
CHANGELOG FAQ INSTALL tv_grab_uk_atlas
Removed Files:
atlasAPIkey
Log Message:
Move API key from separate file to --configure stage
Index: tv_grab_uk_atlas
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/uk_atlas/tv_grab_uk_atlas,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tv_grab_uk_atlas 4 Dec 2013 10:55:16 -0000 1.8
--- tv_grab_uk_atlas 5 Dec 2013 10:36:19 -0000 1.9
***************
*** 272,290 ****
my $baseurl = $ROOT_URL.'schedule.json';
! my $apiKey = '';
! if ( $conf->{'api-key'}->[0] ) {
! $apiKey = readpipe("cat ".$conf->{'api-key'}->[0]);
! chomp($apiKey); chop($apiKey) if ($apiKey =~ m/\r$/);
! if ($apiKey eq '' || $apiKey eq 'PUT YOUR API KEY HERE') {
! print STDERR 'You must obtain an API key free from Atlas Metabroadcast before you can use this grabber'."\n";
! print STDERR 'Instructions are available here: http://metabroadcast.com/blog/getting-full-uk-listings-data-from-atlas-it-s-easy'."\n";
! exit(1);
! }
! $apiKey = '&apiKey='.$apiKey;
}
my $publisher = $conf->{'publisher'}->[0] || 'pressassociation.com'; # (undocumented option needed for xmltv automatic testing)
my $annotations = 'extended_description,broadcasts,series_summary,brand_summary,people,channel';
! my $url = $baseurl.'?'."channel_id=$channel_id&from=$from&to=$to&annotations=$annotations&publisher=$publisher$apiKey";
print $url ."\n" if ($opt->{debug});
#print STDERR "$url \n";
--- 272,286 ----
my $baseurl = $ROOT_URL.'schedule.json';
! my $apiKey = $conf->{'api-key'}->[0];
! chomp($apiKey); chop($apiKey) if ($apiKey =~ m/\r$/);
! if ($apiKey eq '') {
! print STDERR 'You must obtain an API key free from Atlas Metabroadcast before you can use this grabber'."\n";
! print STDERR 'Instructions are available here: http://metabroadcast.com/blog/getting-full-uk-listings-data-from-atlas-it-s-easy'."\n";
! exit(1);
}
my $publisher = $conf->{'publisher'}->[0] || 'pressassociation.com'; # (undocumented option needed for xmltv automatic testing)
my $annotations = 'extended_description,broadcasts,series_summary,brand_summary,people,channel';
! my $url = $baseurl.'?'."channel_id=$channel_id&from=$from&to=$to&annotations=$annotations&publisher=$publisher&apiKey=$apiKey";
print $url ."\n" if ($opt->{debug});
#print STDERR "$url \n";
***************
*** 790,794 ****
open OUT, ">> ".$opt->{'config-file'}
or die "Failed to open $opt->{'config-file'} for writing";
- print OUT "api-key=".get_supplement_dir()."/atlasAPIkey\n";
print OUT "platform-title=$platform_title\n";
print OUT "region-title=$region_title\n";
--- 786,789 ----
***************
*** 1000,1003 ****
--- 995,1011 ----
} );
+ $writer->end('select-apikey');
+
+ }
+ # ------------------------------------------------------------------ #
+ elsif ($stage eq 'select-apikey') {
+
+ $writer->write_string( {
+ id => 'api-key',
+ title => [ [ 'Enter your Atlas API key', 'en' ] ],
+ description => [ [ $GRABBER_NAME.' requires an API key which you must obtain from MetaBroadcast.com', 'en' ] ],
+ default => '',
+ } );
+
$writer->end('select-option');
Index: FAQ
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/uk_atlas/FAQ,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FAQ 4 Dec 2013 11:10:00 -0000 1.1
--- FAQ 5 Dec 2013 10:36:19 -0000 1.2
***************
*** 2,7 ****
==========================
! 1. I'm getting the error "Status: 400 Bad Request"
! Typically this is because you haven't entered your API key into the atlasAPIkey file (located in .xmltv/supplement/tv_grab_uk_atlas/). See the 'Configuration' section in INSTALL for details.
--- 2,13 ----
==========================
! 1. What does "Enter your Atlas API key" mean?
!
! You must obtain an API key free from Atlas MetaBroadcast before you can use this grabber. Instructions are available here: http://metabroadcast.com/blog/getting-full-uk-listings-data-from-atlas-it-s-easy
!
!
! 2. I'm getting the error "Status: 400 Bad Request"
!
! Typically this is because you haven't entered your API key during the --configure stage.
Index: CHANGELOG
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/uk_atlas/CHANGELOG,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CHANGELOG 4 Dec 2013 10:55:16 -0000 1.4
--- CHANGELOG 5 Dec 2013 10:36:19 -0000 1.5
***************
*** 1,2 ****
--- 1,3 ----
+ 1.9 5-Dec-2013 Move apikey from separate file to --configure stage
1.8 4-Dec-2013 Improve error message when API Key missing
1.7 26-Nov-2013 Improve --help handling
Index: INSTALL
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/uk_atlas/INSTALL,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** INSTALL 17 Oct 2013 17:14:23 -0000 1.1
--- INSTALL 5 Dec 2013 10:36:19 -0000 1.2
***************
*** 23,27 ****
tv_grab_uk_atlas.map.conf
tv_grab_uk_atlas.map.genre.conf
- atlasAPIkey
--- 23,26 ----
***************
*** 35,39 ****
Instructions are available here: http://metabroadcast.com/blog/getting-full-uk-listings-data-from-atlas-it-s-easy
! Once you have your API key then edit the file 'atlasAPIkey' and insert your key as the only line in this file.
--- 34,38 ----
Instructions are available here: http://metabroadcast.com/blog/getting-full-uk-listings-data-from-atlas-it-s-easy
! You will need to enter your API key during the --configure stage.
***************
*** 173,193 ****
(Having channel ids of the form "bbc1.bbc.co.uk" will be rejected by many PVRs since they require the data to match their own list.)
!
! It may also report
!
! "tv_sort failed on the concatenated data. Probably due to overlapping data between days."
!
! This is a bug in ValidateGrabber.pm (lines 348-353) which insists on the data retrieved being 00:00-23:59 during its "notadditive" test:
!
! "grabbing data for tomorrow first and then for the day after tomorrow and
! concatenating them does not yield the same result as grabbing the data
! for tomorrow and the day after tomorrow at once."
!
!
! Both these errors can be ignored.
!
! "Grabber validated ok."
!
!
--- 172,176 ----
(Having channel ids of the form "bbc1.bbc.co.uk" will be rejected by many PVRs since they require the data to match their own list.)
! This error can be ignored.
--- atlasAPIkey DELETED ---
------------------------------------------------------------------------------
Sponsored by Intel(R) XDK
Develop, test and display web and hybrid apps with a single code base.
Download it for free now!
http://pubads.g.doubleclick.net/gampad/clk?id=111408631&iu=/4140/ostg.clktrk