mirrors/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-01-23 09:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply suggestions from review

Browse source
This commit is contained in:
coletdjnz 2025-01-05 09:54:13 +13:00
parent e474e4ca95
commit 766a9c015c
No known key found for this signature in database
GPG key ID: 91984263BB39894A
1 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
yt_dlp/extractor/youtube.py
View file

@ -32,7 +32,6 @@
classproperty, classproperty,
clean_html, clean_html,
datetime_from_str, datetime_from_str,
dict_get,
filesize_from_tbr, filesize_from_tbr,
filter_dict, filter_dict,
float_or_none, float_or_none,
@ -652,27 +651,21 @@ def _make_sid_authorization(scheme, sid, origin, additional_parts):
_SAPISID = _3PSAPISID = _1PSAPISID = None _SAPISID = _3PSAPISID = _1PSAPISID = None
def _load_sid_cookies(self): def _load_sid_cookies(self):
yt_cookies = self._get_cookies('https://www.youtube.com') yt_cookies = self._get_cookies('https://www.youtube.com')
if self._SAPISID is None: yt_sapisid = try_call(lambda: yt_cookies['SAPISID'].value)
yt_3papisid = try_call(lambda: yt_cookies['__Secure-3PAPISID'].value)
if not self._SAPISID:
# Sometimes SAPISID cookie isn't present but __Secure-3PAPISID is. # Sometimes SAPISID cookie isn't present but __Secure-3PAPISID is.
# YouTube also falls back to __Secure-3PAPISID if SAPISID is missing. # YouTube also falls back to __Secure-3PAPISID if SAPISID is missing.
# See: https://github.com/yt-dlp/yt-dlp/issues/393 # See: https://github.com/yt-dlp/yt-dlp/issues/393
self._SAPISID = yt_sapisid or yt_3papisid
sapisid_cookie = dict_get( if not self._1PSAPISID:
yt_cookies, ('SAPISID', '__Secure-3PAPISID')) self._1PSAPISID = try_call(lambda: yt_cookies['__Secure-1PAPISID'].value)
if sapisid_cookie and sapisid_cookie.value:
self._SAPISID = sapisid_cookie.value
if self._1PSAPISID is None: if not self._3PSAPISID:
_1papisid_cookie = yt_cookies.get('__Secure-1PAPISID') self._3PSAPISID = yt_3papisid
if _1papisid_cookie and _1papisid_cookie.value:
self._1PSAPISID = _1papisid_cookie.value
if self._3PSAPISID is None:
_3papisid_cookie = yt_cookies.get('__Secure-3PAPISID')
if _3papisid_cookie and _3papisid_cookie.value:
self._3PSAPISID = _3papisid_cookie.value
def _generate_sid_authorization(self, origin='https://www.youtube.com', user_session_id=None): def _generate_sid_authorization(self, origin='https://www.youtube.com', user_session_id=None):
""" """