From d29862b6e9d6d41d4122d68b38bd967c0752e77a Mon Sep 17 00:00:00 2001 From: bashonly <88596187+bashonly@users.noreply.github.com> Date: Mon, 28 Apr 2025 22:26:36 +0000 Subject: [PATCH] slight refactor/formatting --- yt_dlp/extractor/niconico.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/yt_dlp/extractor/niconico.py b/yt_dlp/extractor/niconico.py index e1a674a2b3..22d130baee 100644 --- a/yt_dlp/extractor/niconico.py +++ b/yt_dlp/extractor/niconico.py @@ -62,12 +62,11 @@ class NiconicoBaseIE(InfoExtractor): }, data=urlencode_postdata({ 'mail_tel': username, 'password': password, - }), - ) + })) + if self.is_logged_in: return - - if err_msg := traverse_obj(webpage, ( + elif err_msg := traverse_obj(webpage, ( {find_element(cls='notice error')}, {find_element(cls='notice__text')}, {clean_html}, )): self._raise_login_error(err_msg, 'Invalid username or password') @@ -80,18 +79,18 @@ class NiconicoBaseIE(InfoExtractor): 'Content-Type': 'application/x-www-form-urlencoded', }, data=urlencode_postdata({ 'otp': self._get_tfa_info('6 digit number shown on app'), - }), - ) - - if 'error-code' in parse_qs(urlh.url): + })) + if self.is_logged_in: + return + elif 'error-code' in parse_qs(urlh.url): err_msg = traverse_obj(mfa, ({find_element(cls='pageMainMsg')}, {clean_html})) self._raise_login_error(err_msg, 'MFA session expired') - if 'formError' in mfa: + elif 'formError' in mfa: err_msg = traverse_obj(mfa, ( {find_element(cls='formError')}, {find_element(tag='div')}, {clean_html})) self._raise_login_error(err_msg, 'MFA challenge failed') - else: - self._raise_login_error(None, 'Unexpected login error', expected=False) + + self._raise_login_error(None, 'Unexpected login error', expected=False) class NiconicoIE(NiconicoBaseIE):