artem/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2026-05-04 06:26:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply suggestions

Browse Source
This commit is contained in:
doe1080 2025-04-27 07:54:53 +09:00
parent 9df297ca91
commit 83464efdd7
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
yt_dlp/extractor/niconico.py
View File

@ -41,18 +41,22 @@ class NiconicoBaseIE(InfoExtractor):
_LOGIN_BASE = 'https://account.nicovideo.jp' _LOGIN_BASE = 'https://account.nicovideo.jp'
_NETRC_MACHINE = 'niconico' _NETRC_MACHINE = 'niconico'
@property
def is_logged_in(self):
return bool(self._get_cookies('https://www.nicovideo.jp').get('user_session'))
def raise_login_error(self, error, default, expected=True): def raise_login_error(self, error, default, expected=True):
raise ExtractorError(f'Unable to login: {error or default}', expected=expected) raise ExtractorError(f'Unable to login: {error or default}', expected=expected)
def _perform_login(self, username, password): def _perform_login(self, username, password):
if self._get_cookies('https://www.nicovideo.jp').get('user_session'): if self.is_logged_in:
return return
self._request_webpage( self._request_webpage(
f'{self._LOGIN_BASE}/login', None, 'Requesting session cookies') f'{self._LOGIN_BASE}/login', None, 'Requesting session cookies')
webpage = self._download_webpage( webpage = self._download_webpage(
f'{self._LOGIN_BASE}/login/redirector', None, f'{self._LOGIN_BASE}/login/redirector', None,
'Logging in', headers={ 'Logging in', 'Unable to log in', headers={
'Content-Type': 'application/x-www-form-urlencoded', 'Content-Type': 'application/x-www-form-urlencoded',
'Referer': f'{self._LOGIN_BASE}/login', 'Referer': f'{self._LOGIN_BASE}/login',
}, data=urlencode_postdata({ }, data=urlencode_postdata({
@ -60,11 +64,7 @@ class NiconicoBaseIE(InfoExtractor):
'password': password, 'password': password,
}), }),
) )
if self.is_logged_in:
if traverse_obj(self._search_json(
r'NicoGoogleTagManagerDataLayer\s*=\s*\[',
webpage, 'data layer', None, fatal=False,
), ('user', 'login_status', {lambda x: x == 'login'})):
return return
if err_msg := traverse_obj(webpage, ( if err_msg := traverse_obj(webpage, (
@ -84,8 +84,7 @@ class NiconicoBaseIE(InfoExtractor):
) )
if 'error-code' in parse_qs(urlh.url): if 'error-code' in parse_qs(urlh.url):
err_msg = traverse_obj(self._download_webpage(urlh.url, None), ( err_msg = traverse_obj(mfa, ({find_element(cls='pageMainMsg')}, {clean_html}))
{find_element(cls='pageMainMsg')}, {clean_html}))
self.raise_login_error(err_msg, 'MFA session expired') self.raise_login_error(err_msg, 'MFA session expired')
if 'formError' in mfa: if 'formError' in mfa:
err_msg = traverse_obj(mfa, ( err_msg = traverse_obj(mfa, (