[videopremium] Support new crazy redirect scheme

11 years ago · c4864091a1
parent 9a98a466b3
commit c4864091a1
1 changed files with 9 additions and 5 deletions
--- a/youtube_dl/extractor/videopremium.py
+++ b/youtube_dl/extractor/videopremium.py
@ -24,12 +24,16 @@ class VideoPremiumIE(InfoExtractor):
        webpage_url = 'http://videopremium.tv/' + video_id
        webpage = self._download_webpage(webpage_url, video_id)
-        self.report_extraction(video_id)
+        if re.match(r"^<html><head><script[^>]*>window.location\s*=", webpage):
            # Download again, we need a cookie
            webpage = self._download_webpage(
                webpage_url, video_id,
                note=u'Downloading webpage again (with cookie)')
-        video_title = self._html_search_regex(r'<h2(?:.*?)>\s*(.+?)\s*<',
+        video_title = self._html_search_regex(
-            webpage, u'video title')
+            r'<h2(?:.*?)>\s*(.+?)\s*<', webpage, u'video title')
-        return [{
+        return {
            'id':          video_id,
            'url':         "rtmp://e%d.md.iplay.md/play" % random.randint(1, 16),
            'play_path':   "mp4:%s.f4v" % video_id,
@ -37,4 +41,4 @@ class VideoPremiumIE(InfoExtractor):
            'player_url':  "http://videopremium.tv/uplayer/uppod.swf",
            'ext':         'f4v',
            'title':       video_title,
-        }]
+        }