http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10558
Revision: 10558 Author: platonides Date: 2012-10-12 15:39:36 +0000 (Fri, 12 Oct 2012) Log Message: ----------- Add support for flickr secret key, in order to view non-public images.
Same as erfgoedbot r1005
Modified Paths: -------------- trunk/pywikipedia/config.py trunk/pywikipedia/flickrripper.py
Modified: trunk/pywikipedia/config.py =================================================================== --- trunk/pywikipedia/config.py 2012-10-11 20:21:00 UTC (rev 10557) +++ trunk/pywikipedia/config.py 2012-10-12 15:39:36 UTC (rev 10558) @@ -352,6 +352,7 @@ # Using the Flickr api flickr = { 'api_key': u'', # Provide your key! + 'api_secret': u'', # Api secret of your key (optional) 'review': False, # Do we use automatically make our uploads reviewed? 'reviewer': u'', # If so, under what reviewer name? }
Modified: trunk/pywikipedia/flickrripper.py =================================================================== --- trunk/pywikipedia/flickrripper.py 2012-10-11 20:21:00 UTC (rev 10557) +++ trunk/pywikipedia/flickrripper.py 2012-10-12 15:39:36 UTC (rev 10558) @@ -495,14 +495,23 @@ #imagerecat.initLists()
#Get the api key - if config.flickr['api_key']: - flickr = flickrapi.FlickrAPI(config.flickr['api_key']) - else: + if not config.flickr['api_key']: pywikibot.output('Flickr api key not found! Get yourself an api key') pywikibot.output( 'Any flickr user can get a key at http://www.flickr.com/services/api/keys/apply/') return
+ if config.flickr['api_secret']: + flickr = flickrapi.FlickrAPI(config.flickr['api_key'], config.flickr['api_secret']) + (token, frob) = flickr.get_token_part_one(perms='read') + if not token: # The user still hasn't authorised this app yet, get_token_part_one() will have spawn a browser window + pywikibot.output("Press ENTER after you authorized this program") + flickr.get_token_part_two((token, frob)) + else: + print 'Accessing public content only' + flickr = flickrapi.FlickrAPI(config.flickr['api_key']) + + group_id = u'' photoset_id = u'' user_id = u''