aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2014-05-17 17:58:37 +0700
committerSergey M․ <dstftw@gmail.com>2014-05-17 17:58:37 +0700
commit1514f74967c0ce7f06a956c9faf02048da7a6486 (patch)
tree7153e27005b70ad973e8928195dc6245c29e4ef2 /youtube_dl/extractor
parent91994c2c81302fede68ead037e3f3e7353b1b5d5 (diff)
[ndr] Fix thumbnail extraction
Diffstat (limited to 'youtube_dl/extractor')
-rw-r--r--youtube_dl/extractor/ndr.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/youtube_dl/extractor/ndr.py b/youtube_dl/extractor/ndr.py
index 0650f9564..0905d7bb8 100644
--- a/youtube_dl/extractor/ndr.py
+++ b/youtube_dl/extractor/ndr.py
@@ -66,10 +66,12 @@ class NDRIE(InfoExtractor):
video_url = re.search(r'''3: {src:'(?P<video>.+?)\.hi\.mp4', type:"video/mp4"},''', page)
if video_url:
- thumbnail = self._html_search_regex(r'(?m)title: "NDR PLAYER",\s*poster: "([^"]+)",',
- page, 'thumbnail', fatal=False)
- if thumbnail:
- thumbnail = 'http://www.ndr.de' + thumbnail
+ thumbnails = re.findall(r'''\d+: {src: "([^"]+)"(?: \|\| '[^']+')?, quality: '([^']+)'}''', page)
+ if thumbnails:
+ QUALITIES = ['xs', 's', 'm', 'l', 'xl']
+ thumbnails.sort(key=lambda thumb: QUALITIES.index(thumb[1]))
+ thumbnail = 'http://www.ndr.de' + thumbnails[-1][0]
+
for format_id in ['lo', 'hi', 'hq']:
formats.append({
'url': '%s.%s.mp4' % (video_url.group('video'), format_id),