youtube-dl

commit d9116714f253b2c0d75528062ee568cd844204e7
parent 08965906a8d379e2be795ae5841e8860df17cf24
Author: Sergey M․ <dstftw@gmail.com>
Date:   Sun,  2 Nov 2014 08:01:14 +0700

[cinemassacre] Fix extraction (Closes #4083)

Diffstat:
M
youtube_dl/extractor/cinemassacre.py
 | 
7
++-----

1 file changed, 2 insertions(+), 5 deletions(-)
diff --git 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 = []