X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fniconico.py;h=0f8aa5adad5b2247621ce00249f3bd03a33a104a;hb=3a99d321a8b7d1efc85199fe06f192118ad4bf2e;hp=0ca046ac2ee1f8b5d8836362e404c465d9967122;hpb=bb865f3a5e7290f0da43d180f068f8715c39e3ae;p=youtube-dl diff --git a/youtube_dl/extractor/niconico.py b/youtube_dl/extractor/niconico.py index 0ca046ac2..0f8aa5ada 100644 --- a/youtube_dl/extractor/niconico.py +++ b/youtube_dl/extractor/niconico.py @@ -3,6 +3,7 @@ from __future__ import unicode_literals import re import json +import datetime from .common import InfoExtractor from ..compat import ( @@ -38,13 +39,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,23 +54,30 @@ class NiconicoIE(InfoExtractor): 'timestamp': 1304065916, 'duration': 209, }, - 'params': { - 'username': 'ydl.niconico@gmail.com', - 'password': 'youtube-dl', - }, }, { # 'video exists but is marked as "deleted" + # md5 is unstable 'url': 'http://www.nicovideo.jp/watch/sm10000', - 'md5': '38e53c9aad548f3ecf01ca7680b59b08', 'info_dict': { 'id': 'sm10000', 'ext': 'unknown_video', 'description': 'deleted', 'title': 'ãã©ãããã¨ã¿ã¼ãã«ç¬¬3話ã決æ¦ç¬¬3æ°æ±äº¬å¸ãï¼åç·¨ï¼', + 'upload_date': '20071224', + 'timestamp': 1198527840, # timestamp field has different value if logged in + 'duration': 304, }, - 'params': { - 'username': 'ydl.niconico@gmail.com', - 'password': 'youtube-dl', + }, { + 'url': 'http://www.nicovideo.jp/watch/so22543406', + 'info_dict': { + 'id': '1388129933', + 'ext': 'mp4', + 'title': 'ã第1åãRADIOã¢ãã¡ãããã¯ã¹ ã©ãã©ã¤ãï¼ï½ã®ãããRadio Gardenï½', + 'description': 'md5:b27d224bb0ff53d3c8269e9f8b561cf1', + 'timestamp': 1388851200, + 'upload_date': '20140104', + 'uploader': 'ã¢ãã¡ããã£ã³ãã«', + 'uploader_id': '312', } }] @@ -116,7 +121,10 @@ class NiconicoIE(InfoExtractor): # Get video webpage. We are not actually interested in it for normal # cases, but need the cookies in order to be able to download the # info webpage - webpage = self._download_webpage('http://www.nicovideo.jp/watch/' + video_id, video_id) + webpage, handle = self._download_webpage_handle( + 'http://www.nicovideo.jp/watch/' + video_id, video_id) + if video_id.startswith('so'): + video_id = self._match_id(handle.geturl()) video_info = self._download_xml( 'http://ext.nicovideo.jp/api/getthumbinfo/' + video_id, video_id, @@ -158,22 +166,65 @@ 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']+class="videoHeaderTitle"[^>]*>([^<]+)', webpage, 'video title') + watch_api_data_string = self._html_search_regex( + r'