diff options
| author | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-11-03 05:17:12 -0800 |
|---|---|---|
| committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-11-03 05:17:12 -0800 |
| commit | 1baf9a59388f2b10fee0f7fc60b548dc11ed08b7 (patch) | |
| tree | e36feb67306c59a0ac99019db2535370ed67aefa | |
| parent | a56f9de156c7cca29dfa45de1dadc66e10a265f2 (diff) | |
| parent | ab4e15134719e6c01a3a9768f21a0f361e4b781d (diff) | |
| download | youtube-dl-1baf9a59388f2b10fee0f7fc60b548dc11ed08b7.tar.gz youtube-dl-1baf9a59388f2b10fee0f7fc60b548dc11ed08b7.tar.xz youtube-dl-1baf9a59388f2b10fee0f7fc60b548dc11ed08b7.zip | |
Merge pull request #1698 from rzhxeo/cinemassacre
[CinemassacreIE] Support more embed urls
| -rw-r--r-- | youtube_dl/extractor/cinemassacre.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/extractor/cinemassacre.py b/youtube_dl/extractor/cinemassacre.py index 2fe1033f0..8f9396d6b 100644 --- a/youtube_dl/extractor/cinemassacre.py +++ b/youtube_dl/extractor/cinemassacre.py @@ -41,7 +41,7 @@ class CinemassacreIE(InfoExtractor): webpage_url = u'http://' + mobj.group('url') webpage = self._download_webpage(webpage_url, None) # Don't know video id yet video_date = mobj.group('date_Y') + mobj.group('date_m') + mobj.group('date_d') - mobj = re.search(r'src="(?P<embed_url>http://player\.screenwavemedia\.com/play/(?:embed|player)\.php\?id=(?:Cinemassacre-)?(?P<video_id>.+?))"', webpage) + mobj = re.search(r'src="(?P<embed_url>http://player\.screenwavemedia\.com/play/[a-zA-Z]+\.php\?id=(?:Cinemassacre-)?(?P<video_id>.+?))"', webpage) if not mobj: raise ExtractorError(u'Can\'t extract embed url and video id') playerdata_url = mobj.group(u'embed_url') |