mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-12-26 18:57:42 +00:00
[niconico] Remove credentials from tests and enhance title extraction
All test videos can be downloaded without username and password now.
This commit is contained in:
parent
bb865f3a5e
commit
59d814f793
1 changed files with 4 additions and 13 deletions
|
@ -38,13 +38,10 @@ class NiconicoIE(InfoExtractor):
|
|||
'description': '(c) copyright 2008, Blender Foundation / www.bigbuckbunny.org',
|
||||
'duration': 33,
|
||||
},
|
||||
'params': {
|
||||
'username': 'ydl.niconico@gmail.com',
|
||||
'password': 'youtube-dl',
|
||||
},
|
||||
}, {
|
||||
# File downloaded with and without credentials are different, so omit
|
||||
# the md5 field
|
||||
'url': 'http://www.nicovideo.jp/watch/nm14296458',
|
||||
'md5': '8db08e0158457cf852a31519fceea5bc',
|
||||
'info_dict': {
|
||||
'id': 'nm14296458',
|
||||
'ext': 'swf',
|
||||
|
@ -56,10 +53,6 @@ class NiconicoIE(InfoExtractor):
|
|||
'timestamp': 1304065916,
|
||||
'duration': 209,
|
||||
},
|
||||
'params': {
|
||||
'username': 'ydl.niconico@gmail.com',
|
||||
'password': 'youtube-dl',
|
||||
},
|
||||
}, {
|
||||
# 'video exists but is marked as "deleted"
|
||||
'url': 'http://www.nicovideo.jp/watch/sm10000',
|
||||
|
@ -70,10 +63,6 @@ class NiconicoIE(InfoExtractor):
|
|||
'description': 'deleted',
|
||||
'title': 'ドラえもんエターナル第3話「決戦第3新東京市」<前編>',
|
||||
},
|
||||
'params': {
|
||||
'username': 'ydl.niconico@gmail.com',
|
||||
'password': 'youtube-dl',
|
||||
}
|
||||
}]
|
||||
|
||||
_VALID_URL = r'https?://(?:www\.|secure\.)?nicovideo\.jp/watch/(?P<id>(?:[a-z]{2})?[0-9]+)'
|
||||
|
@ -158,6 +147,8 @@ class NiconicoIE(InfoExtractor):
|
|||
|
||||
# Start extracting information
|
||||
title = xpath_text(video_info, './/title')
|
||||
if not title:
|
||||
title = self._og_search_title(webpage, default=None)
|
||||
if not title:
|
||||
title = self._html_search_regex(
|
||||
r'<span[^>]+class="videoHeaderTitle"[^>]*>([^<]+)</span>',
|
||||
|
|
Loading…
Reference in a new issue