diff options
| author | Sergey M․ <dstftw@gmail.com> | 2015-08-29 19:06:55 +0600 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2015-08-29 19:06:55 +0600 |
| commit | 109a4156e17b2c0dee414151fa37db2d208df43d (patch) | |
| tree | 7f4c32f570b823097b142cedf35356dfaab23930 | |
| parent | 678d33295ba45833cedc2abab9c906d12dae9bee (diff) | |
| download | youtube-dl-109a4156e17b2c0dee414151fa37db2d208df43d.tar.gz youtube-dl-109a4156e17b2c0dee414151fa37db2d208df43d.tar.xz youtube-dl-109a4156e17b2c0dee414151fa37db2d208df43d.zip | |
[cinemassacre] Use screenwavemedia embed pattern
| -rw-r--r-- | youtube_dl/extractor/cinemassacre.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/youtube_dl/extractor/cinemassacre.py b/youtube_dl/extractor/cinemassacre.py index c949a4814..fd1770dac 100644 --- a/youtube_dl/extractor/cinemassacre.py +++ b/youtube_dl/extractor/cinemassacre.py @@ -6,6 +6,7 @@ import re from .common import InfoExtractor from ..utils import ExtractorError from .bliptv import BlipTVIE +from .screenwavemedia import ScreenwaveMediaIE class CinemassacreIE(InfoExtractor): @@ -83,10 +84,10 @@ class CinemassacreIE(InfoExtractor): playerdata_url = self._search_regex( [ - r'src="(http://(?:player2\.screenwavemedia\.com|player\.screenwavemedia\.com/play)/[a-zA-Z]+\.php\?[^"]*\bid=.+?)"', - r'<iframe[^>]+src="((?:https?:)?//(?:[^.]+\.)?youtube\.com/.+?)"', + ScreenwaveMediaIE.EMBED_PATTERN, + r'<iframe[^>]+src="(?P<url>(?:https?:)?//(?:[^.]+\.)?youtube\.com/.+?)"', ], - webpage, 'player data URL', default=None) + webpage, 'player data URL', default=None, group='url') if not playerdata_url: playerdata_url = BlipTVIE._extract_url(webpage) if not playerdata_url: |