R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[extractor/generic] Use _extract_url for mtvservices

Browse Source
This commit is contained in:
Sergey M․ 2015-09-26 19:47:20 +06:00 committed by dabiboo
parent 37e8fcf280
commit 9754a00825
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
youtube_dl/extractor/generic.py
View File

@ -50,6 +50,7 @@ from .dailymotion import DailymotionCloudIE
from .onionstudios import OnionStudiosIE from .onionstudios import OnionStudiosIE
from .snagfilms import SnagFilmsEmbedIE from .snagfilms import SnagFilmsEmbedIE
from .screenwavemedia import ScreenwaveMediaIE from .screenwavemedia import ScreenwaveMediaIE
from .mtv import MTVServicesEmbeddedIE
class GenericIE(InfoExtractor): class GenericIE(InfoExtractor):
@ -1611,12 +1612,9 @@ class GenericIE(InfoExtractor):
return self.url_result(url, ie='Vulture') return self.url_result(url, ie='Vulture')
# Look for embedded mtvservices player # Look for embedded mtvservices player
mobj = re.search( mtvservices_url = MTVServicesEmbeddedIE._extract_url(webpage)
r'<iframe src="(?P<url>https?://media\.mtvnservices\.com/embed/[^"]+)"', if mtvservices_url:
webpage) return self.url_result(mtvservices_url, ie='MTVServicesEmbedded')
if mobj is not None:
url = unescapeHTML(mobj.group('url'))
return self.url_result(url, ie='MTVServicesEmbedded')
# Look for embedded yahoo player # Look for embedded yahoo player
mobj = re.search( mobj = re.search(