projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[jwplatform] Support DASH streams
[youtube-dl]
/
youtube_dl
/
extractor
/
mgtv.py
diff --git
a/youtube_dl/extractor/mgtv.py
b/youtube_dl/extractor/mgtv.py
index d970e94ecd2425db06056ea615af02b92a39e292..e0bb5d208856a121f40f533fcacf3b7bd98d13ea 100644
(file)
--- a/
youtube_dl/extractor/mgtv.py
+++ b/
youtube_dl/extractor/mgtv.py
@@
-6,10
+6,10
@@
from ..utils import int_or_none
class MGTVIE(InfoExtractor):
class MGTVIE(InfoExtractor):
- _VALID_URL = r'https?://
www\.
mgtv\.com/v/(?:[^/]+/)*(?P<id>\d+)\.html'
+ _VALID_URL = r'https?://
(?:www\.)?
mgtv\.com/v/(?:[^/]+/)*(?P<id>\d+)\.html'
IE_DESC = '芒果TV'
IE_DESC = '芒果TV'
- _TEST
=
{
+ _TEST
S = [
{
'url': 'http://www.mgtv.com/v/1/290525/f/3116640.html',
'md5': '1bdadcf760a0b90946ca68ee9a2db41a',
'info_dict': {
'url': 'http://www.mgtv.com/v/1/290525/f/3116640.html',
'md5': '1bdadcf760a0b90946ca68ee9a2db41a',
'info_dict': {
@@
-20,7
+20,11
@@
class MGTVIE(InfoExtractor):
'duration': 7461,
'thumbnail': 're:^https?://.*\.jpg$',
},
'duration': 7461,
'thumbnail': 're:^https?://.*\.jpg$',
},
- }
+ }, {
+ # no tbr extracted from stream_url
+ 'url': 'http://www.mgtv.com/v/1/1/f/3324755.html',
+ 'only_matching': True,
+ }]
def _real_extract(self, url):
video_id = self._match_id(url)
def _real_extract(self, url):
video_id = self._match_id(url)
@@
-41,7
+45,8
@@
class MGTVIE(InfoExtractor):
def extract_format(stream_url, format_id, idx, query={}):
format_info = self._download_json(
stream_url, video_id,
def extract_format(stream_url, format_id, idx, query={}):
format_info = self._download_json(
stream_url, video_id,
- note='Download video info for format %s' % format_id or '#%d' % idx, query=query)
+ note='Download video info for format %s' % (format_id or '#%d' % idx),
+ query=query)
return {
'format_id': format_id,
'url': format_info['info'],
return {
'format_id': format_id,
'url': format_info['info'],