yt_dlp/extractor/eplus.py

@@ -75,14 +75,18 @@ class EplusIbIE(InfoExtractor):
     }]
 
     _USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36 Edg/119.0.0.0'
+    _TEST_EVENT_URL = 'https://live.eplus.jp/2053935'
 
-    def _login(self, username, password, urlh):
+    def _perform_login(self, id, password):
-        if not self._get_cookies('https://live.eplus.jp/').get('ci_session'):
+        urlh = self._request_webpage(
-            raise ExtractorError('Unable to get ci_session cookie')
+            self._TEST_EVENT_URL, None, note='Getting auth status', errnote='Unable to get auth status')
+        if urlh.url.startswith(self._TEST_EVENT_URL):
+            # already logged in
+            return
 
         cltft_token = urlh.headers.get('X-CLTFT-Token')
         if not cltft_token:
-            raise ExtractorError('Unable to get X-CLTFT-Token')
+            raise ExtractorError('Unable to get X-CLTFT-Token', expected=False)
         self._set_cookie('live.eplus.jp', 'X-CLTFT-Token', cltft_token)
 
         login_json = self._download_json(
@@ -93,7 +97,7 @@ class EplusIbIE(InfoExtractor):
                 'X-Cltft-Token': cltft_token,
                 'Accept': '*/*',
             }, data=json.dumps({
-                'loginId': username,
+                'loginId': id,
                 'loginPassword': password,
             }).encode())
         if not login_json.get('isSuccess'):
@@ -102,7 +106,7 @@ class EplusIbIE(InfoExtractor):
         self._request_webpage(
             urlh.url, None, note='Logging in', errnote='Unable to log in',
             data=urlencode_postdata({
-                'loginId': username,
+                'loginId': id,
                 'loginPassword': password,
                 'Token.Default': cltft_token,
                 'op': 'nextPage',
@@ -113,12 +117,7 @@ class EplusIbIE(InfoExtractor):
         webpage, urlh = self._download_webpage_handle(
             url, video_id, headers={'User-Agent': self._USER_AGENT})
         if urlh.url.startswith('https://live.eplus.jp/member/auth'):
-            username, password = self._get_login_info()
+            self.raise_login_required()
-            if not username:
-                self.raise_login_required()
-            self._login(username, password, urlh)
-            webpage = self._download_webpage(
-                url, video_id, headers={'User-Agent': self._USER_AGENT})
 
         data_json = self._search_json(r'<script>\s*var app\s*=', webpage, 'data json', video_id)