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

Apply suggestions from code review

Browse Source
This commit is contained in:
bashonly 2025-04-27 04:45:20 +00:00 committed by GitHub
parent 83464efdd7
commit 20be1c0fff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
yt_dlp/extractor/niconico.py
View File

@ -45,7 +45,7 @@ class NiconicoBaseIE(InfoExtractor):
def is_logged_in(self): def is_logged_in(self):
return bool(self._get_cookies('https://www.nicovideo.jp').get('user_session')) 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):
@ -70,7 +70,7 @@ class NiconicoBaseIE(InfoExtractor):
if err_msg := traverse_obj(webpage, ( if err_msg := traverse_obj(webpage, (
{find_element(cls='notice error')}, {find_element(cls='notice__text')}, {clean_html}, {find_element(cls='notice error')}, {find_element(cls='notice__text')}, {clean_html},
)): )):
self.raise_login_error(err_msg, 'Invalid username or password') self._raise_login_error(err_msg, 'Invalid username or password')
elif 'oneTimePw' in webpage: elif 'oneTimePw' in webpage:
post_url = self._search_regex( post_url = self._search_regex(
r'<form[^>]+action=(["\'])(?P<url>.+?)\1', webpage, 'post url', group='url') r'<form[^>]+action=(["\'])(?P<url>.+?)\1', webpage, 'post url', group='url')
@ -85,13 +85,13 @@ class NiconicoBaseIE(InfoExtractor):
if 'error-code' in parse_qs(urlh.url): if 'error-code' in parse_qs(urlh.url):
err_msg = traverse_obj(mfa, ({find_element(cls='pageMainMsg')}, {clean_html})) err_msg = traverse_obj(mfa, ({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, (
{find_element(cls='formError')}, {find_element(tag='div')}, {clean_html})) {find_element(cls='formError')}, {find_element(tag='div')}, {clean_html}))
self.raise_login_error(err_msg, 'MFA challenge failed') self._raise_login_error(err_msg, 'MFA challenge failed')
else: else:
self.raise_login_error(None, 'Unexpected login error', expected=False) self._raise_login_error(None, 'Unexpected login error', expected=False)
class NiconicoIE(NiconicoBaseIE): class NiconicoIE(NiconicoBaseIE):