projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[nowtv] Fix extraction (Closes #6169)
[youtube-dl]
/
youtube_dl
/
extractor
/
yinyuetai.py
diff --git
a/youtube_dl/extractor/yinyuetai.py
b/youtube_dl/extractor/yinyuetai.py
index a4ada4872fc5627260ee4976fe78a1c3a727d971..834d860af32871678f8fef5afd345353273ebc19 100644
(file)
--- a/
youtube_dl/extractor/yinyuetai.py
+++ b/
youtube_dl/extractor/yinyuetai.py
@@
-7,7
+7,8
@@
from ..utils import ExtractorError
class YinYueTaiIE(InfoExtractor):
IE_NAME = 'yinyuetai:video'
class YinYueTaiIE(InfoExtractor):
IE_NAME = 'yinyuetai:video'
- _VALID_URL = r'https?://v\.yinyuetai\.com/video(/h5)?/(?P<id>[0-9]+)'
+ IE_DESC = '音悦Tai'
+ _VALID_URL = r'https?://v\.yinyuetai\.com/video(?:/h5)?/(?P<id>[0-9]+)'
_TESTS = [{
'url': 'http://v.yinyuetai.com/video/2322376',
'md5': '6e3abe28d38e3a54b591f9f040595ce0',
_TESTS = [{
'url': 'http://v.yinyuetai.com/video/2322376',
'md5': '6e3abe28d38e3a54b591f9f040595ce0',
@@
-16,6
+17,8
@@
class YinYueTaiIE(InfoExtractor):
'ext': 'mp4',
'title': '少女时代_PARTY_Music Video Teaser',
'creator': '少女时代',
'ext': 'mp4',
'title': '少女时代_PARTY_Music Video Teaser',
'creator': '少女时代',
+ 'duration': 25,
+ 'thumbnail': 're:^https?://.*\.jpg$',
},
}, {
'url': 'http://v.yinyuetai.com/video/h5/2322376',
},
}, {
'url': 'http://v.yinyuetai.com/video/h5/2322376',
@@
-35,18
+38,19
@@
class YinYueTaiIE(InfoExtractor):
formats = [{
'url': format_info['videoUrl'],
'format_id': format_info['qualityLevel'],
formats = [{
'url': format_info['videoUrl'],
'format_id': format_info['qualityLevel'],
- 'format': format_info['qualityLevelName'],
- 'filesize': format_info['fileSize'],
+ 'format': format_info.get('qualityLevelName'),
+ 'filesize': format_info.get('fileSize'),
+ # though URLs ends with .flv, the downloaded files are in fact mp4
'ext': 'mp4',
'ext': 'mp4',
- '
preference': format_info['bitrate']
,
+ '
tbr': format_info.get('bitrate')
,
} for format_info in info['videoUrlModels']]
self._sort_formats(formats)
return {
'id': video_id,
'title': info['videoName'],
} for format_info in info['videoUrlModels']]
self._sort_formats(formats)
return {
'id': video_id,
'title': info['videoName'],
- 'thumbnail': info
['bigHeadImage']
,
- 'creator': info
['artistNames']
,
- 'duration': info
['duration']
,
+ 'thumbnail': info
.get('bigHeadImage')
,
+ 'creator': info
.get('artistNames')
,
+ 'duration': info
.get('duration')
,
'formats': formats,
}
'formats': formats,
}