projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f52354a
)
[videomega] Fix extraction (closes #7606)
author
Yen Chi Hsuan
<yan12125@gmail.com>
Fri, 26 Feb 2016 07:00:48 +0000
(15:00 +0800)
committer
Yen Chi Hsuan
<yan12125@gmail.com>
Fri, 26 Feb 2016 07:00:48 +0000
(15:00 +0800)
youtube_dl/extractor/videomega.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/videomega.py
b/youtube_dl/extractor/videomega.py
index 5e2e7cbacc4d52a91dd3a789b76874fffac069db..4f0dcd18c7f28ab17aec58c814d53fd8ae21e7ac 100644
(file)
--- a/
youtube_dl/extractor/videomega.py
+++ b/
youtube_dl/extractor/videomega.py
@@
-4,11
+4,13
@@
from __future__ import unicode_literals
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
-from ..utils import sanitized_Request
+from ..utils import (
+ decode_packed_codes,
+ sanitized_Request,
+)
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',
@@
-42,8
+44,10
@@
class VideoMegaIE(InfoExtractor):
r'(?:^[Vv]ideo[Mm]ega\.tv\s-\s*|\s*-\svideomega\.tv$)', '', title)
thumbnail = self._search_regex(
r'<video[^>]+?poster="([^"]+)"', webpage, 'thumbnail', fatal=False)
r'(?:^[Vv]ideo[Mm]ega\.tv\s-\s*|\s*-\svideomega\.tv$)', '', title)
thumbnail = self._search_regex(
r'<video[^>]+?poster="([^"]+)"', webpage, 'thumbnail', fatal=False)
+
+ real_codes = decode_packed_codes(webpage)
video_url = self._search_regex(
video_url = self._search_regex(
- r'
<source[^>]+?src="([^"]+)"', webpage
, 'video URL')
+ r'
"src"\s*,\s*"([^"]+)"', real_codes
, 'video URL')
return {
'id': video_id,
return {
'id': video_id,