aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey M. <dstftw@gmail.com>2014-02-07 19:23:53 +0700
committerSergey M. <dstftw@gmail.com>2014-02-07 19:23:53 +0700
commitc6fdba23a684d4edbc265e04a188e8eb7da810a9 (patch)
tree9c5a2726822d067c2b6370e85e43946255df44d7
parentb19fe521a99e084446dc4274b168c9c2102b073d (diff)
downloadyoutube-dl-c6fdba23a684d4edbc265e04a188e8eb7da810a9.tar.xz
[nfb] Add workaround for python2.6
-rw-r--r--youtube_dl/extractor/nfb.py43
1 files changed, 30 insertions, 13 deletions
diff --git a/youtube_dl/extractor/nfb.py b/youtube_dl/extractor/nfb.py
index 92b4bb8df..a8c514f53 100644
--- a/youtube_dl/extractor/nfb.py
+++ b/youtube_dl/extractor/nfb.py
@@ -49,20 +49,37 @@ class NFBIE(InfoExtractor):
config = self._download_xml(request, video_id, 'Downloading player config XML')
- thumbnail = config.find("./player/stream/media[@type='posterImage']/assets/asset[@quality='high']/default/url").text
- video = config.find("./player/stream/media[@type='video']")
- duration = int(video.get('duration'))
- title = video.find('title').text
- description = video.find('description').text
+ title = None
+ description = None
+ thumbnail = None
+ duration = None
+ formats = []
- # It seems assets always go from lower to better quality, so no need to sort
- formats = [{
- 'url': x.find('default/streamerURI').text + '/',
- 'play_path': x.find('default/url').text,
- 'rtmp_live': False,
- 'ext': 'mp4',
- 'format_id': x.get('quality'),
- } for x in video.findall('assets/asset')]
+ def extract_thumbnail(media):
+ thumbnails = {}
+ for asset in media.findall('assets/asset'):
+ thumbnails[asset.get('quality')] = asset.find('default/url').text
+ if not thumbnails:
+ return None
+ if 'high' in thumbnails:
+ return thumbnails['high']
+ return list(thumbnails.values())[0]
+
+ for media in config.findall('./player/stream/media'):
+ if media.get('type') == 'posterImage':
+ thumbnail = extract_thumbnail(media)
+ elif media.get('type') == 'video':
+ duration = int(media.get('duration'))
+ title = media.find('title').text
+ description = media.find('description').text
+ # It seems assets always go from lower to better quality, so no need to sort
+ formats = [{
+ 'url': x.find('default/streamerURI').text + '/',
+ 'play_path': x.find('default/url').text,
+ 'rtmp_live': False,
+ 'ext': 'mp4',
+ 'format_id': x.get('quality'),
+ } for x in media.findall('assets/asset')]
return {
'id': video_id,