github/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2025-08-24 07:05:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge eda204a2dc into 0c24eed73a

Browse source
This commit is contained in:
GitHub Merge Button 2012-04-23 10:16:11 -07:00
commit 66709e6857
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
youtube-dl
View file

@ -1749,12 +1749,16 @@ class DailymotionIE(InfoExtractor):
video_title = _unescapeHTML(mobj.group('title').decode('utf-8')) video_title = _unescapeHTML(mobj.group('title').decode('utf-8'))
video_title = sanitize_title(video_title) video_title = sanitize_title(video_title)
simple_title = _simplify_title(video_title) simple_title = _simplify_title(video_title)
mobj = re.search(r'(?im)<span class="owner[^\"]+?">[^<]+?<a [^>]+?>([^<]+?)</a></span>', webpage) spanowner = re.search(r'(?im)<span class="owner[^\"]+?">[^<]+?<a [^>]+?>([^<]+?)</a></span>', webpage)
spanname = re.search(r'(?im)<span class="name[^\"]+?"[^\>]+?>([^\>]+?)</span>', webpage)
mobj = spanowner if spanowner else spanname
if mobj is None: if mobj is None:
self._downloader.trouble(u'ERROR: unable to extract uploader nickname') video_uploader = "Unknown"
return #you need to use -i option to discard this error and continue with the download
video_uploader = mobj.group(1) self._downloader.trouble(u'WARNING: unable to extract uploader nickname')
else:
video_uploader = mobj.group(1)
try: try:
# Process video information # Process video information