|
|
@ -663,6 +663,8 @@ class NiconicoPlaylistIE(InfoExtractor):
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class NicovideoSearchBaseIE(InfoExtractor):
|
|
|
|
class NicovideoSearchBaseIE(InfoExtractor):
|
|
|
|
|
|
|
|
_SEARCH_TYPE = 'search'
|
|
|
|
|
|
|
|
|
|
|
|
def _entries(self, url, item_id, query=None, note='Downloading page %(page)s'):
|
|
|
|
def _entries(self, url, item_id, query=None, note='Downloading page %(page)s'):
|
|
|
|
query = query or {}
|
|
|
|
query = query or {}
|
|
|
|
pages = [query['page']] if 'page' in query else itertools.count(1)
|
|
|
|
pages = [query['page']] if 'page' in query else itertools.count(1)
|
|
|
@ -677,7 +679,7 @@ class NicovideoSearchBaseIE(InfoExtractor):
|
|
|
|
|
|
|
|
|
|
|
|
def _search_results(self, query):
|
|
|
|
def _search_results(self, query):
|
|
|
|
return self._entries(
|
|
|
|
return self._entries(
|
|
|
|
self._proto_relative_url(f'//www.nicovideo.jp/search/{query}'), query)
|
|
|
|
self._proto_relative_url(f'//www.nicovideo.jp/{self._SEARCH_TYPE}/{query}'), query)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class NicovideoSearchIE(NicovideoSearchBaseIE, SearchInfoExtractor):
|
|
|
|
class NicovideoSearchIE(NicovideoSearchBaseIE, SearchInfoExtractor):
|
|
|
@ -757,6 +759,25 @@ class NicovideoSearchDateIE(NicovideoSearchBaseIE, SearchInfoExtractor):
|
|
|
|
yield from super()._entries(url, item_id, query=query, note=note)
|
|
|
|
yield from super()._entries(url, item_id, query=query, note=note)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class NicovideoTagURLIE(NicovideoSearchBaseIE):
|
|
|
|
|
|
|
|
IE_NAME = 'niconico:tag'
|
|
|
|
|
|
|
|
IE_DESC = 'NicoNico video tag URLs'
|
|
|
|
|
|
|
|
_SEARCH_TYPE = 'tag'
|
|
|
|
|
|
|
|
_VALID_URL = r'https?://(?:www\.)?nicovideo\.jp/tag/(?P<id>[^?#&]+)?'
|
|
|
|
|
|
|
|
_TESTS = [{
|
|
|
|
|
|
|
|
'url': 'https://www.nicovideo.jp/tag/ドキュメンタリー淫夢',
|
|
|
|
|
|
|
|
'info_dict': {
|
|
|
|
|
|
|
|
'id': 'ドキュメンタリー淫夢',
|
|
|
|
|
|
|
|
'title': 'ドキュメンタリー淫夢'
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
'playlist_mincount': 400,
|
|
|
|
|
|
|
|
}]
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _real_extract(self, url):
|
|
|
|
|
|
|
|
query = self._match_id(url)
|
|
|
|
|
|
|
|
return self.playlist_result(self._entries(url, query), query, query)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class NiconicoUserIE(InfoExtractor):
|
|
|
|
class NiconicoUserIE(InfoExtractor):
|
|
|
|
_VALID_URL = r'https?://(?:www\.)?nicovideo\.jp/user/(?P<id>\d+)/?(?:$|[#?])'
|
|
|
|
_VALID_URL = r'https?://(?:www\.)?nicovideo\.jp/user/(?P<id>\d+)/?(?:$|[#?])'
|
|
|
|
_TEST = {
|
|
|
|
_TEST = {
|
|
|
|