minhngoc25a
/
yt-dlc
mirror of https://github.com/blackjack4494/yt-dlc
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'niconico-channel-video' of https://github.com/hakatashi/youtube-dl into hakatashi-niconico-channel-video

This commit is contained in:
Sergey M․ 2014-07-04 21:39:54 +07:00
parent 6feb2d5e80 64ed7a38f9
commit 0ff30c5333
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
youtube_dl/extractor/niconico.py
View File

@ -37,7 +37,7 @@ class NiconicoIE(InfoExtractor):
}, },
} }
_VALID_URL = r'^https?://(?:www\.|secure\.)?nicovideo\.jp/watch/([a-z][a-z][0-9]+)(?:.*)$' _VALID_URL = r'^https?://(?:www\.|secure\.)?nicovideo\.jp/watch/((?:[a-z][a-z])?[0-9]+)(?:.*)$'
_NETRC_MACHINE = 'niconico' _NETRC_MACHINE = 'niconico'
def _real_initialize(self): def _real_initialize(self):
@ -91,20 +91,18 @@ class NiconicoIE(InfoExtractor):
video_format = video_extension.upper() video_format = video_extension.upper()
video_thumbnail = video_info.find('.//thumbnail_url').text video_thumbnail = video_info.find('.//thumbnail_url').text
video_description = video_info.find('.//description').text video_description = video_info.find('.//description').text
video_uploader_id = video_info.find('.//user_id').text
video_upload_date = unified_strdate(video_info.find('.//first_retrieve').text.split('+')[0]) video_upload_date = unified_strdate(video_info.find('.//first_retrieve').text.split('+')[0])
video_view_count = video_info.find('.//view_counter').text video_view_count = video_info.find('.//view_counter').text
video_webpage_url = video_info.find('.//watch_url').text video_webpage_url = video_info.find('.//watch_url').text
# uploader # uploader
video_uploader = video_uploader_id # No need to fetch extra resources...new API has field for uploader's name
url = 'http://seiga.nicovideo.jp/api/user/info?id=' + video_uploader_id if video_info.find('.//ch_id') is not None:
try: video_uploader_id = video_info.find('.//ch_id').text
user_info = self._download_xml( video_uploader = video_info.find('.//ch_name').text
url, video_id, note='Downloading user information') elif video_info.find('.//user_id') is not None:
video_uploader = user_info.find('.//nickname').text video_uploader_id = video_info.find('.//user_id').text
except ExtractorError as err: video_uploader = video_info.find('.//user_nickname').text
self._downloader.report_warning('Unable to download user info webpage: %s' % compat_str(err))
return { return {
'id': video_id, 'id': video_id,