From efd712c69b6c77d216c1ec3e6243e49254f5e37f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergey=20M=E2=80=A4?= Date: Sat, 29 Aug 2015 19:07:31 +0600 Subject: [PATCH] [generic] Use screenwavemedia embed pattern --- youtube_dl/extractor/generic.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 5d41b6319..c9b36221e 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -48,6 +48,7 @@ from .vimeo import VimeoIE from .dailymotion import DailymotionCloudIE from .onionstudios import OnionStudiosIE from .snagfilms import SnagFilmsEmbedIE +from .screenwavemedia import ScreenwaveMediaIE class GenericIE(InfoExtractor): @@ -1719,13 +1720,9 @@ class GenericIE(InfoExtractor): return self.url_result(snagfilms_url) # Look for ScreenwaveMedia embeds - mobj = re.search( - r']+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: - return self.url_result( - unescapeHTML(mobj.group(1)), - 'ScreenwaveMedia') + return self.url_result(unescapeHTML(mobj.group('url')), 'ScreenwaveMedia') # Look for AdobeTVVideo embeds mobj = re.search(