[cinemassacre] Fix extraction (Closes #4083)
authorSergey M․ <dstftw@gmail.com>
Sun, 2 Nov 2014 01:01:14 +0000 (08:01 +0700)
committerSergey M․ <dstftw@gmail.com>
Sun, 2 Nov 2014 01:01:14 +0000 (08:01 +0700)
youtube_dl/extractor/cinemassacre.py

index d064a28f97920933f30cc11ec323858d5c5ee5f0..806e378b1b6da0eebe01bdd3992d53814090bf59 100644 (file)
@@ -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 = []