projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'rrooij-gamekings_fix'
[youtube-dl]
/
youtube_dl
/
extractor
/
videomega.py
diff --git
a/youtube_dl/extractor/videomega.py
b/youtube_dl/extractor/videomega.py
index 78ff6310a07f6864abda658ca1e804e26594460b..5e2e7cbacc4d52a91dd3a789b76874fffac069db 100644
(file)
--- a/
youtube_dl/extractor/videomega.py
+++ b/
youtube_dl/extractor/videomega.py
@@
-4,10
+4,11
@@
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):
+ _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',
_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',
@@
-30,7
+31,7
@@
class VideoMegaIE(InfoExtractor):
video_id = self._match_id(url)
iframe_url = 'http://videomega.tv/cdn.php?ref=%s' % video_id
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)