diff options
| author | remitamine <[email protected]> | 2015-12-21 22:10:16 +0100 |
|---|---|---|
| committer | remitamine <[email protected]> | 2015-12-21 22:10:16 +0100 |
| commit | eed30fea755f454582eb5ff555517cce3870dc87 (patch) | |
| tree | 50353dfbc8a007a8ab9eb1b20cd08aae239910a5 /youtube_dl/extractor/flickr.py | |
| parent | 5625bd0617d6c661c66049b420556ae442102ffc (diff) | |
| download | youtube-dl-eed30fea755f454582eb5ff555517cce3870dc87.tar.gz youtube-dl-eed30fea755f454582eb5ff555517cce3870dc87.zip | |
[flickr] fix format sorting
Diffstat (limited to 'youtube_dl/extractor/flickr.py')
| -rw-r--r-- | youtube_dl/extractor/flickr.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/youtube_dl/extractor/flickr.py b/youtube_dl/extractor/flickr.py index 452b27b26..18f439df9 100644 --- a/youtube_dl/extractor/flickr.py +++ b/youtube_dl/extractor/flickr.py @@ -50,13 +50,19 @@ class FlickrIE(InfoExtractor): def _real_extract(self, url): video_id = self._match_id(url) - api_key = self._download_json('https://www.flickr.com/hermes_error_beacon.gne', video_id, 'Downloading api key',)['site_key'] + api_key = self._download_json( + 'https://www.flickr.com/hermes_error_beacon.gne', video_id, + 'Downloading api key')['site_key'] - video_info = self._call_api('photos.getInfo', video_id, api_key, 'Downloading video info')['photo'] + video_info = self._call_api( + 'photos.getInfo', video_id, api_key, 'Downloading video info')['photo'] if video_info['media'] == 'video': - streams = self._call_api('video.getStreamInfo', video_id, api_key, 'Downloading streams info', video_info['secret'])['streams'] + streams = self._call_api( + 'video.getStreamInfo', video_id, api_key, + 'Downloading streams info', video_info['secret'])['streams'] - preference = qualities(['iphone_wifi', '700', 'appletv', 'orig']) + preference = qualities( + ['288p', 'iphone_wifi', '100', '300', '700', '360p', 'appletv', '720p', '1080p', 'orig']) formats = [] for stream in streams['stream']: |