summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-08-29 19:07:31 +0600
committerSergey M․ <dstftw@gmail.com>2015-08-29 19:07:31 +0600
commitefd712c69b6c77d216c1ec3e6243e49254f5e37f (patch)
tree27db790fe9e82779aad91f804d524f254a1d80cb
parent109a4156e17b2c0dee414151fa37db2d208df43d (diff)
downloadyoutube-dl-efd712c69b6c77d216c1ec3e6243e49254f5e37f.tar.gz
youtube-dl-efd712c69b6c77d216c1ec3e6243e49254f5e37f.tar.xz
youtube-dl-efd712c69b6c77d216c1ec3e6243e49254f5e37f.zip
[generic] Use screenwavemedia embed pattern
-rw-r--r--youtube_dl/extractor/generic.py9
1 files 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'<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:
-            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(