Browse Source

[generic] Use screenwavemedia embed pattern

master
Sergey M․ 9 years ago
parent
commit
efd712c69b
1 changed files with 3 additions and 6 deletions
  1. 9
      youtube_dl/extractor/generic.py

9
youtube_dl/extractor/generic.py

@ -48,6 +48,7 @@ from .vimeo import VimeoIE
from .dailymotion import DailymotionCloudIE from .dailymotion import DailymotionCloudIE
from .onionstudios import OnionStudiosIE from .onionstudios import OnionStudiosIE
from .snagfilms import SnagFilmsEmbedIE from .snagfilms import SnagFilmsEmbedIE
from .screenwavemedia import ScreenwaveMediaIE
class GenericIE(InfoExtractor): class GenericIE(InfoExtractor):
@ -1719,13 +1720,9 @@ class GenericIE(InfoExtractor):
return self.url_result(snagfilms_url) return self.url_result(snagfilms_url)
# Look for ScreenwaveMedia embeds # Look for ScreenwaveMedia embeds
mobj = re.search(
r'<script[^>]+src=[\'"](http://player\d?\.screenwavemedia\.com/player\.php\?id=[A-Za-z0-9-]+)[\'"]',
webpage)
mobj = re.search(ScreenwaveMediaIE.EMBED_PATTERN, webpage)
if mobj is not None: if mobj is not None:
return self.url_result(
unescapeHTML(mobj.group(1)),
'ScreenwaveMedia')
return self.url_result(unescapeHTML(mobj.group('url')), 'ScreenwaveMedia')
# Look for AdobeTVVideo embeds # Look for AdobeTVVideo embeds
mobj = re.search( mobj = re.search(

Loading…
Cancel
Save