schmittlauch/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into subtitles_rework

Browse source
This commit is contained in:
Ismael Mejia 2013-08-26 04:03:40 +02:00
commit 06a401c845
7 changed files with 368 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

9
youtube_dl/extractor/dailymotion.py
View file

@ -1,5 +1,6 @@
import re
import json
import itertools
import socket
from .common import InfoExtractor
@ -33,7 +34,7 @@ class DailyMotionSubtitlesIE(NoAutoSubtitlesIE):
self._downloader.report_warning(u'video doesn\'t have subtitles')
return {}
class DailymotionIE(DailyMotionSubtitlesIE):
class DailymotionIE(DailyMotionSubtitlesIE, InfoExtractor):
"""Information Extractor for Dailymotion"""
_VALID_URL = r'(?i)(?:https?://)?(?:www\.)?dailymotion\.[a-z]{2,3}/video/([^/]+)'
@ -43,7 +44,7 @@ class DailymotionIE(DailyMotionSubtitlesIE):
u'file': u'x33vw9.mp4',
u'md5': u'392c4b85a60a90dc4792da41ce3144eb',
u'info_dict': {
u"uploader": u"Alex and Van .",
u"uploader": u"Alex and Van .",
u"title": u"Tutoriel de Youtubeur\"DL DES VIDEO DE YOUTUBE\""
}
}
@ -85,9 +86,9 @@ class DailymotionIE(DailyMotionSubtitlesIE):
for key in ['stream_h264_hd1080_url','stream_h264_hd_url',
'stream_h264_hq_url','stream_h264_url',
'stream_h264_ld_url']:
if info.get(key): # key in info and info[key]:
if info.get(key):#key in info and info[key]:
max_quality = key
self.to_screen(u'%s: Using %s' % (video_id, key))
self.to_screen(u'Using %s' % key)
break
else:
raise ExtractorError(u'Unable to extract video URL')