diff options
| author | Sergey M․ <dstftw@gmail.com> | 2015-09-26 19:47:20 +0600 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2015-09-26 19:47:20 +0600 |
| commit | 46fde8a1a2e72bca3c22b6de4db06490fb90b59a (patch) | |
| tree | 3c7072b4604dbd892ab1366900afac7ecaf54c0f /youtube_dl | |
| parent | fe1d858e35dde4c3068b9bec8a1bac7bd2cafadb (diff) | |
[extractor/generic] Use _extract_url for mtvservices
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/extractor/generic.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 8881a8a23..22ec78a02 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -50,6 +50,7 @@ from .dailymotion import DailymotionCloudIE from .onionstudios import OnionStudiosIE from .snagfilms import SnagFilmsEmbedIE from .screenwavemedia import ScreenwaveMediaIE +from .mtv import MTVServicesEmbeddedIE class GenericIE(InfoExtractor): @@ -1611,12 +1612,9 @@ class GenericIE(InfoExtractor): return self.url_result(url, ie='Vulture') # Look for embedded mtvservices player - mobj = re.search( - r'<iframe src="(?P<url>https?://media\.mtvnservices\.com/embed/[^"]+)"', - webpage) - if mobj is not None: - url = unescapeHTML(mobj.group('url')) - return self.url_result(url, ie='MTVServicesEmbedded') + mtvservices_url = MTVServicesEmbeddedIE._extract_url(webpage) + if mtvservices_url: + return self.url_result(mtvservices_url, ie='MTVServicesEmbedded') # Look for embedded yahoo player mobj = re.search( |