projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Add support for search result URLs (Fixes #2495)
[youtube-dl]
/
youtube_dl
/
extractor
/
mtv.py
diff --git
a/youtube_dl/extractor/mtv.py
b/youtube_dl/extractor/mtv.py
index f6f31bfdc53c6cb0685cfb74e9cc59b56269d77f..5447b6c0cab098b895eda0e9f2b3b266fb65a7b0 100644
(file)
--- a/
youtube_dl/extractor/mtv.py
+++ b/
youtube_dl/extractor/mtv.py
@@
-86,6
+86,9
@@
class MTVServicesInfoExtractor(InfoExtractor):
title_el = itemdoc.find('.//{http://search.yahoo.com/mrss/}title')
if title_el is None:
title_el = itemdoc.find('.//title')
title_el = itemdoc.find('.//{http://search.yahoo.com/mrss/}title')
if title_el is None:
title_el = itemdoc.find('.//title')
+ if title_el.text is None:
+ title_el = None
+
title = title_el.text
if title is None:
raise ExtractorError('Could not find video title')
title = title_el.text
if title is None:
raise ExtractorError('Could not find video title')
@@
-119,7
+122,9
@@
class MTVServicesInfoExtractor(InfoExtractor):
if mgid.endswith('.swf'):
mgid = mgid[:-4]
except RegexNotFoundError:
if mgid.endswith('.swf'):
mgid = mgid[:-4]
except RegexNotFoundError:
- mgid = self._search_regex(r'data-mgid="(.*?)"', webpage, u'mgid')
+ mgid = self._search_regex(
+ [r'data-mgid="(.*?)"', r'swfobject.embedSWF\(".*?(mgid:.*?)"'],
+ webpage, u'mgid')
return self._get_videos_info(mgid)
return self._get_videos_info(mgid)