mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2025-08-15 17:08:29 +00:00
Merge branch 'yt-dlp:master' into tunein
This commit is contained in:
commit
73190c8130
@ -105,7 +105,7 @@ class SubsPoTokenPolicy(BasePoTokenPolicy):
|
|||||||
'INNERTUBE_CONTEXT_CLIENT_NAME': 1,
|
'INNERTUBE_CONTEXT_CLIENT_NAME': 1,
|
||||||
'SUPPORTS_COOKIES': True,
|
'SUPPORTS_COOKIES': True,
|
||||||
**WEB_PO_TOKEN_POLICIES,
|
**WEB_PO_TOKEN_POLICIES,
|
||||||
'PLAYER_PARAMS': '8AEB',
|
'PLAYER_PARAMS': '8AEB2AMB',
|
||||||
},
|
},
|
||||||
# Safari UA returns pre-merged video+audio 144p/240p/360p/720p/1080p HLS formats
|
# Safari UA returns pre-merged video+audio 144p/240p/360p/720p/1080p HLS formats
|
||||||
'web_safari': {
|
'web_safari': {
|
||||||
@ -119,7 +119,7 @@ class SubsPoTokenPolicy(BasePoTokenPolicy):
|
|||||||
'INNERTUBE_CONTEXT_CLIENT_NAME': 1,
|
'INNERTUBE_CONTEXT_CLIENT_NAME': 1,
|
||||||
'SUPPORTS_COOKIES': True,
|
'SUPPORTS_COOKIES': True,
|
||||||
**WEB_PO_TOKEN_POLICIES,
|
**WEB_PO_TOKEN_POLICIES,
|
||||||
'PLAYER_PARAMS': '8AEB',
|
'PLAYER_PARAMS': '8AEB2AMB',
|
||||||
},
|
},
|
||||||
'web_embedded': {
|
'web_embedded': {
|
||||||
'INNERTUBE_CONTEXT': {
|
'INNERTUBE_CONTEXT': {
|
||||||
@ -282,7 +282,7 @@ class SubsPoTokenPolicy(BasePoTokenPolicy):
|
|||||||
'userAgent': 'Mozilla/5.0 (iPad; CPU OS 16_7_10 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1,gzip(gfe)',
|
'userAgent': 'Mozilla/5.0 (iPad; CPU OS 16_7_10 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1,gzip(gfe)',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
'PLAYER_PARAMS': '8AEB',
|
'PLAYER_PARAMS': '8AEB2AMB',
|
||||||
'INNERTUBE_CONTEXT_CLIENT_NAME': 2,
|
'INNERTUBE_CONTEXT_CLIENT_NAME': 2,
|
||||||
'GVS_PO_TOKEN_POLICY': {
|
'GVS_PO_TOKEN_POLICY': {
|
||||||
StreamingProtocol.HTTPS: GvsPoTokenPolicy(
|
StreamingProtocol.HTTPS: GvsPoTokenPolicy(
|
||||||
@ -314,7 +314,7 @@ class SubsPoTokenPolicy(BasePoTokenPolicy):
|
|||||||
},
|
},
|
||||||
'INNERTUBE_CONTEXT_CLIENT_NAME': 7,
|
'INNERTUBE_CONTEXT_CLIENT_NAME': 7,
|
||||||
'SUPPORTS_COOKIES': True,
|
'SUPPORTS_COOKIES': True,
|
||||||
'PLAYER_PARAMS': '8AEB',
|
'PLAYER_PARAMS': '8AEB2AMB',
|
||||||
},
|
},
|
||||||
'tv_simply': {
|
'tv_simply': {
|
||||||
'INNERTUBE_CONTEXT': {
|
'INNERTUBE_CONTEXT': {
|
||||||
|
@ -153,6 +153,12 @@ def _get_system_deprecation():
|
|||||||
f'{variant} (the PyInstaller-bundled executable for macOS versions older than 10.15)',
|
f'{variant} (the PyInstaller-bundled executable for macOS versions older than 10.15)',
|
||||||
'issues/13856', STOP_MSG)
|
'issues/13856', STOP_MSG)
|
||||||
|
|
||||||
|
# Temporary until linux_armv7l executable builds are discontinued
|
||||||
|
if variant in ('linux_armv7l_exe'):
|
||||||
|
return EXE_MSG_TMPL.format(
|
||||||
|
f'{variant} (the PyInstaller-bundled executable for the Linux armv7l platform)',
|
||||||
|
'issues/13976', STOP_MSG)
|
||||||
|
|
||||||
if sys.version_info > MIN_RECOMMENDED:
|
if sys.version_info > MIN_RECOMMENDED:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
@ -162,13 +168,6 @@ def _get_system_deprecation():
|
|||||||
if sys.version_info < MIN_SUPPORTED:
|
if sys.version_info < MIN_SUPPORTED:
|
||||||
return f'Python version {major}.{minor} is no longer supported! {PYTHON_MSG}'
|
return f'Python version {major}.{minor} is no longer supported! {PYTHON_MSG}'
|
||||||
|
|
||||||
# Temporary until aarch64/armv7l build flow is bumped to Ubuntu 22.04 and Python 3.10
|
|
||||||
if variant in ('linux_aarch64_exe', 'linux_armv7l_exe'):
|
|
||||||
libc_ver = version_tuple(os.confstr('CS_GNU_LIBC_VERSION').partition(' ')[2])
|
|
||||||
if libc_ver < (2, 35):
|
|
||||||
return EXE_MSG_TMPL.format('system glibc version < 2.35', 'issues/13858', STOP_MSG)
|
|
||||||
return None
|
|
||||||
|
|
||||||
return f'Support for Python version {major}.{minor} has been deprecated. {PYTHON_MSG}'
|
return f'Support for Python version {major}.{minor} has been deprecated. {PYTHON_MSG}'
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user