New upstream version 2019.01.17

[youtubedl] / youtube_dl / extractor / videomega.py

diff --git a/youtube_dl/extractor/videomega.py b/youtube_dl/extractor/videomega.py
index 29c4e0101ec21eb59c22de9739a516b9f96c0e0f..c02830dddcd838dbfc8070c17a009d5924a00f7e 100644 (file)
--- a/youtube_dl/extractor/videomega.py
+++ b/youtube_dl/extractor/videomega.py
@@ -5,53 +5,56 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
-    compat_urllib_parse,
-    remove_start,
+    decode_packed_codes,
+    sanitized_Request,
 )
 
 
 class VideoMegaIE(InfoExtractor):
-    _VALID_URL = r'''(?x)https?://
-        (?:www\.)?videomega\.tv/
-        (?:iframe\.php)?\?ref=(?P<id>[A-Za-z0-9]+)
-        '''
-    _TEST = {
-        'url': 'http://videomega.tv/?ref=GKeGPVedBe',
-        'md5': '240fb5bcf9199961f48eb17839b084d6',
+    _VALID_URL = r'(?:videomega:|https?://(?:www\.)?videomega\.tv/(?:(?:view|iframe|cdn)\.php)?\?ref=)(?P<id>[A-Za-z0-9]+)'
+    _TESTS = [{
+        'url': 'http://videomega.tv/cdn.php?ref=AOSQBJYKIDDIKYJBQSOA',
+        'md5': 'cc1920a58add3f05c6a93285b84fb3aa',
         'info_dict': {
-            'id': 'GKeGPVedBe',
+            'id': 'AOSQBJYKIDDIKYJBQSOA',
             'ext': 'mp4',
-            'title': 'XXL - All Sports United',
-            'thumbnail': 're:^https?://.*\.jpg$',
+            'title': '1254207',
+            'thumbnail': r're:^https?://.*\.jpg$',
         }
-    }
+    }, {
+        'url': 'http://videomega.tv/cdn.php?ref=AOSQBJYKIDDIKYJBQSOA&width=1070&height=600',
+        'only_matching': True,
+    }, {
+        'url': 'http://videomega.tv/view.php?ref=090051111052065112106089103052052103089106112065052111051090',
+        'only_matching': True,
+    }]
 
     def _real_extract(self, url):
-        mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group('id')
-
-        url = 'http://videomega.tv/iframe.php?ref={0:}'.format(video_id)
-        webpage = self._download_webpage(url, video_id)
-
-        escaped_data = self._search_regex(
-            r'unescape\("([^"]+)"\)', webpage, 'escaped data')
-        playlist = compat_urllib_parse.unquote(escaped_data)
-
+        video_id = self._match_id(url)
+
+        iframe_url = 'http://videomega.tv/cdn.php?ref=%s' % video_id
+        req = sanitized_Request(iframe_url)
+        req.add_header('Referer', url)
+        req.add_header('Cookie', 'noadvtday=0')
+        webpage = self._download_webpage(req, video_id)
+
+        title = self._html_search_regex(
+            r'<title>(.+?)</title>', webpage, 'title')
+        title = re.sub(
+            r'(?:^[Vv]ideo[Mm]ega\.tv\s-\s*|\s*-\svideomega\.tv$)', '', title)
         thumbnail = self._search_regex(
-            r'image:\s*"([^"]+)"', playlist, 'thumbnail', fatal=False)
-        url = self._search_regex(r'file:\s*"([^"]+)"', playlist, 'URL')
-        title = remove_start(self._html_search_regex(
-            r'<title>(.*?)</title>', webpage, 'title'), 'VideoMega.tv - ')
+            r'<video[^>]+?poster="([^"]+)"', webpage, 'thumbnail', fatal=False)
 
-        formats = [{
-            'format_id': 'sd',
-            'url': url,
-        }]
-        self._sort_formats(formats)
+        real_codes = decode_packed_codes(webpage)
+        video_url = self._search_regex(
+            r'"src"\s*,\s*"([^"]+)"', real_codes, 'video URL')
 
         return {
             'id': video_id,
             'title': title,
-            'formats': formats,
+            'url': video_url,
             'thumbnail': thumbnail,
+            'http_headers': {
+                'Referer': iframe_url,
+            },
         }