mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-09-08 09:35:01 +00:00
Merge pull request #1660 from pyed/master
[addanime] try to download HQ before normal
This commit is contained in:
commit
efb4c36b18
|
@ -17,8 +17,8 @@ class AddAnimeIE(InfoExtractor):
|
||||||
IE_NAME = u'AddAnime'
|
IE_NAME = u'AddAnime'
|
||||||
_TEST = {
|
_TEST = {
|
||||||
u'url': u'http://www.add-anime.net/watch_video.php?v=24MR3YO5SAS9',
|
u'url': u'http://www.add-anime.net/watch_video.php?v=24MR3YO5SAS9',
|
||||||
u'file': u'24MR3YO5SAS9.flv',
|
u'file': u'24MR3YO5SAS9.mp4',
|
||||||
u'md5': u'1036a0e0cd307b95bd8a8c3a5c8cfaf1',
|
u'md5': u'72954ea10bc979ab5e2eb288b21425a0',
|
||||||
u'info_dict': {
|
u'info_dict': {
|
||||||
u"description": u"One Piece 606",
|
u"description": u"One Piece 606",
|
||||||
u"title": u"One Piece 606"
|
u"title": u"One Piece 606"
|
||||||
|
@ -60,8 +60,10 @@ class AddAnimeIE(InfoExtractor):
|
||||||
note=u'Confirming after redirect')
|
note=u'Confirming after redirect')
|
||||||
webpage = self._download_webpage(url, video_id)
|
webpage = self._download_webpage(url, video_id)
|
||||||
|
|
||||||
video_url = self._search_regex(r"var normal_video_file = '(.*?)';",
|
video_url = self._search_regex(r"var (?:hq|normal)_video_file = '(.*?)';",
|
||||||
webpage, u'video file URL')
|
webpage, u'video file URL')
|
||||||
|
|
||||||
|
video_extension = video_url[-3:] # mp4 or flv ?
|
||||||
video_title = self._og_search_title(webpage)
|
video_title = self._og_search_title(webpage)
|
||||||
video_description = self._og_search_description(webpage)
|
video_description = self._og_search_description(webpage)
|
||||||
|
|
||||||
|
@ -69,7 +71,7 @@ class AddAnimeIE(InfoExtractor):
|
||||||
'_type': 'video',
|
'_type': 'video',
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
'url': video_url,
|
'url': video_url,
|
||||||
'ext': 'flv',
|
'ext': video_extension,
|
||||||
'title': video_title,
|
'title': video_title,
|
||||||
'description': video_description
|
'description': video_description
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue