aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/cinemassacre.py
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2014-11-02 08:01:14 +0700
committerSergey M․ <dstftw@gmail.com>2014-11-02 08:01:14 +0700
commitd9116714f253b2c0d75528062ee568cd844204e7 (patch)
treed37a89fba51d2174a5b575e4957063bb7f57ffab /youtube_dl/extractor/cinemassacre.py
parent08965906a8d379e2be795ae5841e8860df17cf24 (diff)
[cinemassacre] Fix extraction (Closes #4083)
Diffstat (limited to 'youtube_dl/extractor/cinemassacre.py')
-rw-r--r--youtube_dl/extractor/cinemassacre.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/youtube_dl/extractor/cinemassacre.py b/youtube_dl/extractor/cinemassacre.py
index d064a28f9..806e378b1 100644
--- a/youtube_dl/extractor/cinemassacre.py
+++ b/youtube_dl/extractor/cinemassacre.py
@@ -59,12 +59,9 @@ class CinemassacreIE(InfoExtractor):
vidurl = self._search_regex(
r'\'vidurl\'\s*:\s*"([^\']+)"', playerdata, 'vidurl').replace('\\/', '/')
- vidid = self._search_regex(
- r'\'vidid\'\s*:\s*"([^\']+)"', playerdata, 'vidid')
- videoserver = self._html_search_regex(
- r"'videoserver'\s*:\s*'([^']+)'", playerdata, 'videoserver')
- videolist_url = 'http://%s/vod/smil:%s.smil/jwplayer.smil' % (videoserver, vidid)
+ videolist_url = self._search_regex(
+ r"file\s*:\s*'(http.+?/jwplayer\.smil)'", playerdata, 'jwplayer.smil')
videolist = self._download_xml(videolist_url, video_id, 'Downloading videolist XML')
formats = []