projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[facebook] Add support for DASH manifests
[youtube-dl]
/
youtube_dl
/
extractor
/
videomega.py
diff --git
a/youtube_dl/extractor/videomega.py
b/youtube_dl/extractor/videomega.py
index 42d42adb0ecb6c197e9fd4f51e326ac09ea22eca..5e2e7cbacc4d52a91dd3a789b76874fffac069db 100644
(file)
--- a/
youtube_dl/extractor/videomega.py
+++ b/
youtube_dl/extractor/videomega.py
@@
-4,12
+4,13
@@
from __future__ import unicode_literals
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
-from ..
compat import compat_urllib_r
equest
+from ..
utils import sanitized_R
equest
class VideoMegaIE(InfoExtractor):
class VideoMegaIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?videomega\.tv/(?:(?:view|iframe|cdn)\.php)?\?ref=(?P<id>[A-Za-z0-9]+)'
- _TEST = {
+ _WORKING = False
+ _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': {
'url': 'http://videomega.tv/cdn.php?ref=AOSQBJYKIDDIKYJBQSOA',
'md5': 'cc1920a58add3f05c6a93285b84fb3aa',
'info_dict': {
@@
-18,13
+19,19
@@
class VideoMegaIE(InfoExtractor):
'title': '1254207',
'thumbnail': 're:^https?://.*\.jpg$',
}
'title': '1254207',
'thumbnail': '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):
video_id = self._match_id(url)
iframe_url = 'http://videomega.tv/cdn.php?ref=%s' % video_id
def _real_extract(self, url):
video_id = self._match_id(url)
iframe_url = 'http://videomega.tv/cdn.php?ref=%s' % video_id
- req =
compat_urllib_request.
Request(iframe_url)
+ req =
sanitized_
Request(iframe_url)
req.add_header('Referer', url)
req.add_header('Cookie', 'noadvtday=0')
webpage = self._download_webpage(req, video_id)
req.add_header('Referer', url)
req.add_header('Cookie', 'noadvtday=0')
webpage = self._download_webpage(req, video_id)