mirror of https://github.com/yt-dlp/yt-dlp.git
Merge branch 'yt-dlp:master' into cleanup/2024-05
This commit is contained in:
commit
ed44e23245
|
@ -12,6 +12,9 @@ on:
|
||||||
unix:
|
unix:
|
||||||
default: true
|
default: true
|
||||||
type: boolean
|
type: boolean
|
||||||
|
linux_static:
|
||||||
|
default: true
|
||||||
|
type: boolean
|
||||||
linux_arm:
|
linux_arm:
|
||||||
default: true
|
default: true
|
||||||
type: boolean
|
type: boolean
|
||||||
|
@ -27,9 +30,6 @@ on:
|
||||||
windows32:
|
windows32:
|
||||||
default: true
|
default: true
|
||||||
type: boolean
|
type: boolean
|
||||||
meta_files:
|
|
||||||
default: true
|
|
||||||
type: boolean
|
|
||||||
origin:
|
origin:
|
||||||
required: false
|
required: false
|
||||||
default: ''
|
default: ''
|
||||||
|
@ -52,7 +52,11 @@ on:
|
||||||
default: stable
|
default: stable
|
||||||
type: string
|
type: string
|
||||||
unix:
|
unix:
|
||||||
description: yt-dlp, yt-dlp.tar.gz, yt-dlp_linux, yt-dlp_linux.zip
|
description: yt-dlp, yt-dlp.tar.gz
|
||||||
|
default: true
|
||||||
|
type: boolean
|
||||||
|
linux_static:
|
||||||
|
description: yt-dlp_linux
|
||||||
default: true
|
default: true
|
||||||
type: boolean
|
type: boolean
|
||||||
linux_arm:
|
linux_arm:
|
||||||
|
@ -75,10 +79,6 @@ on:
|
||||||
description: yt-dlp_x86.exe
|
description: yt-dlp_x86.exe
|
||||||
default: true
|
default: true
|
||||||
type: boolean
|
type: boolean
|
||||||
meta_files:
|
|
||||||
description: SHA2-256SUMS, SHA2-512SUMS, _update_spec
|
|
||||||
default: true
|
|
||||||
type: boolean
|
|
||||||
origin:
|
origin:
|
||||||
description: Origin
|
description: Origin
|
||||||
required: false
|
required: false
|
||||||
|
@ -112,27 +112,9 @@ jobs:
|
||||||
- uses: actions/setup-python@v5
|
- uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: "3.10"
|
python-version: "3.10"
|
||||||
- uses: conda-incubator/setup-miniconda@v3
|
|
||||||
with:
|
|
||||||
miniforge-variant: Mambaforge
|
|
||||||
use-mamba: true
|
|
||||||
channels: conda-forge
|
|
||||||
auto-update-conda: true
|
|
||||||
activate-environment: ""
|
|
||||||
auto-activate-base: false
|
|
||||||
- name: Install Requirements
|
- name: Install Requirements
|
||||||
run: |
|
run: |
|
||||||
sudo apt -y install zip pandoc man sed
|
sudo apt -y install zip pandoc man sed
|
||||||
cat > ./requirements.txt << EOF
|
|
||||||
python=3.10.*
|
|
||||||
pyinstaller
|
|
||||||
brotli-python
|
|
||||||
EOF
|
|
||||||
python devscripts/install_deps.py --print \
|
|
||||||
--exclude brotli --exclude brotlicffi \
|
|
||||||
--include secretstorage >> ./requirements.txt
|
|
||||||
mamba create -n build --file ./requirements.txt
|
|
||||||
|
|
||||||
- name: Prepare
|
- name: Prepare
|
||||||
run: |
|
run: |
|
||||||
python devscripts/update-version.py -c "${{ inputs.channel }}" -r "${{ needs.process.outputs.origin }}" "${{ inputs.version }}"
|
python devscripts/update-version.py -c "${{ inputs.channel }}" -r "${{ needs.process.outputs.origin }}" "${{ inputs.version }}"
|
||||||
|
@ -141,30 +123,15 @@ jobs:
|
||||||
- name: Build Unix platform-independent binary
|
- name: Build Unix platform-independent binary
|
||||||
run: |
|
run: |
|
||||||
make all tar
|
make all tar
|
||||||
- name: Build Unix standalone binary
|
|
||||||
shell: bash -l {0}
|
|
||||||
run: |
|
|
||||||
unset LD_LIBRARY_PATH # Harmful; set by setup-python
|
|
||||||
conda activate build
|
|
||||||
python -m bundle.pyinstaller --onedir
|
|
||||||
(cd ./dist/yt-dlp_linux && zip -r ../yt-dlp_linux.zip .)
|
|
||||||
python -m bundle.pyinstaller
|
|
||||||
mv ./dist/yt-dlp_linux ./yt-dlp_linux
|
|
||||||
mv ./dist/yt-dlp_linux.zip ./yt-dlp_linux.zip
|
|
||||||
|
|
||||||
- name: Verify --update-to
|
- name: Verify --update-to
|
||||||
if: vars.UPDATE_TO_VERIFICATION
|
if: vars.UPDATE_TO_VERIFICATION
|
||||||
run: |
|
run: |
|
||||||
binaries=("yt-dlp" "yt-dlp_linux")
|
chmod +x ./yt-dlp
|
||||||
for binary in "${binaries[@]}"; do
|
cp ./yt-dlp ./yt-dlp_downgraded
|
||||||
chmod +x ./${binary}
|
version="$(./yt-dlp --version)"
|
||||||
cp ./${binary} ./${binary}_downgraded
|
./yt-dlp_downgraded -v --update-to yt-dlp/yt-dlp@2023.03.04
|
||||||
version="$(./${binary} --version)"
|
downgraded_version="$(./yt-dlp_downgraded --version)"
|
||||||
./${binary}_downgraded -v --update-to yt-dlp/yt-dlp@2023.03.04
|
|
||||||
downgraded_version="$(./${binary}_downgraded --version)"
|
|
||||||
[[ "$version" != "$downgraded_version" ]]
|
[[ "$version" != "$downgraded_version" ]]
|
||||||
done
|
|
||||||
|
|
||||||
- name: Upload artifacts
|
- name: Upload artifacts
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
|
@ -172,8 +139,39 @@ jobs:
|
||||||
path: |
|
path: |
|
||||||
yt-dlp
|
yt-dlp
|
||||||
yt-dlp.tar.gz
|
yt-dlp.tar.gz
|
||||||
yt-dlp_linux
|
compression-level: 0
|
||||||
yt-dlp_linux.zip
|
|
||||||
|
linux_static:
|
||||||
|
needs: process
|
||||||
|
if: inputs.linux_static
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- name: Build static executable
|
||||||
|
env:
|
||||||
|
channel: ${{ inputs.channel }}
|
||||||
|
origin: ${{ needs.process.outputs.origin }}
|
||||||
|
version: ${{ inputs.version }}
|
||||||
|
run: |
|
||||||
|
mkdir ~/build
|
||||||
|
cd bundle/docker
|
||||||
|
docker compose up --build static
|
||||||
|
sudo chown "${USER}:docker" ~/build/yt-dlp_linux
|
||||||
|
- name: Verify --update-to
|
||||||
|
if: vars.UPDATE_TO_VERIFICATION
|
||||||
|
run: |
|
||||||
|
chmod +x ~/build/yt-dlp_linux
|
||||||
|
cp ~/build/yt-dlp_linux ~/build/yt-dlp_linux_downgraded
|
||||||
|
version="$(~/build/yt-dlp_linux --version)"
|
||||||
|
~/build/yt-dlp_linux_downgraded -v --update-to yt-dlp/yt-dlp@2023.03.04
|
||||||
|
downgraded_version="$(~/build/yt-dlp_linux_downgraded --version)"
|
||||||
|
[[ "$version" != "$downgraded_version" ]]
|
||||||
|
- name: Upload artifacts
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: build-bin-${{ github.job }}
|
||||||
|
path: |
|
||||||
|
~/build/yt-dlp_linux
|
||||||
compression-level: 0
|
compression-level: 0
|
||||||
|
|
||||||
linux_arm:
|
linux_arm:
|
||||||
|
@ -300,7 +298,7 @@ jobs:
|
||||||
macos_legacy:
|
macos_legacy:
|
||||||
needs: process
|
needs: process
|
||||||
if: inputs.macos_legacy
|
if: inputs.macos_legacy
|
||||||
runs-on: macos-latest
|
runs-on: macos-12
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
@ -447,10 +445,11 @@ jobs:
|
||||||
compression-level: 0
|
compression-level: 0
|
||||||
|
|
||||||
meta_files:
|
meta_files:
|
||||||
if: inputs.meta_files && always() && !cancelled()
|
if: always() && !cancelled()
|
||||||
needs:
|
needs:
|
||||||
- process
|
- process
|
||||||
- unix
|
- unix
|
||||||
|
- linux_static
|
||||||
- linux_arm
|
- linux_arm
|
||||||
- macos
|
- macos
|
||||||
- macos_legacy
|
- macos_legacy
|
||||||
|
|
|
@ -53,7 +53,7 @@ jobs:
|
||||||
with:
|
with:
|
||||||
python-version: ${{ matrix.python-version }}
|
python-version: ${{ matrix.python-version }}
|
||||||
- name: Install test requirements
|
- name: Install test requirements
|
||||||
run: python3 ./devscripts/install_deps.py --include dev --include curl_cffi
|
run: python3 ./devscripts/install_deps.py --include dev --include curl-cffi
|
||||||
- name: Run tests
|
- name: Run tests
|
||||||
continue-on-error: False
|
continue-on-error: False
|
||||||
run: |
|
run: |
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
services:
|
||||||
|
static:
|
||||||
|
build: static
|
||||||
|
environment:
|
||||||
|
channel: ${channel}
|
||||||
|
origin: ${origin}
|
||||||
|
version: ${version}
|
||||||
|
volumes:
|
||||||
|
- ~/build:/build
|
||||||
|
- ../..:/yt-dlp
|
|
@ -0,0 +1,21 @@
|
||||||
|
FROM alpine:3.19 as base
|
||||||
|
|
||||||
|
RUN apk --update add --no-cache \
|
||||||
|
build-base \
|
||||||
|
python3 \
|
||||||
|
pipx \
|
||||||
|
;
|
||||||
|
|
||||||
|
RUN pipx install pyinstaller
|
||||||
|
# Requires above step to prepare the shared venv
|
||||||
|
RUN ~/.local/share/pipx/shared/bin/python -m pip install -U wheel
|
||||||
|
RUN apk --update add --no-cache \
|
||||||
|
scons \
|
||||||
|
patchelf \
|
||||||
|
binutils \
|
||||||
|
;
|
||||||
|
RUN pipx install staticx
|
||||||
|
|
||||||
|
WORKDIR /yt-dlp
|
||||||
|
COPY entrypoint.sh /entrypoint.sh
|
||||||
|
ENTRYPOINT /entrypoint.sh
|
|
@ -0,0 +1,13 @@
|
||||||
|
#!/bin/ash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
source ~/.local/share/pipx/venvs/pyinstaller/bin/activate
|
||||||
|
python -m devscripts.install_deps --include secretstorage
|
||||||
|
python -m devscripts.make_lazy_extractors
|
||||||
|
python devscripts/update-version.py -c "${channel}" -r "${origin}" "${version}"
|
||||||
|
python -m bundle.pyinstaller
|
||||||
|
deactivate
|
||||||
|
|
||||||
|
source ~/.local/share/pipx/venvs/staticx/bin/activate
|
||||||
|
staticx /yt-dlp/dist/yt-dlp_linux /build/yt-dlp_linux
|
||||||
|
deactivate
|
|
@ -2059,7 +2059,22 @@ Line 1
|
||||||
assert extract_basic_auth('http://user:pass@foo.bar') == ('http://foo.bar', 'Basic dXNlcjpwYXNz')
|
assert extract_basic_auth('http://user:pass@foo.bar') == ('http://foo.bar', 'Basic dXNlcjpwYXNz')
|
||||||
|
|
||||||
@unittest.skipUnless(compat_os_name == 'nt', 'Only relevant on Windows')
|
@unittest.skipUnless(compat_os_name == 'nt', 'Only relevant on Windows')
|
||||||
def test_Popen_windows_escaping(self):
|
def test_windows_escaping(self):
|
||||||
|
tests = [
|
||||||
|
'test"&',
|
||||||
|
'%CMDCMDLINE:~-1%&',
|
||||||
|
'a\nb',
|
||||||
|
'"',
|
||||||
|
'\\',
|
||||||
|
'!',
|
||||||
|
'^!',
|
||||||
|
'a \\ b',
|
||||||
|
'a \\" b',
|
||||||
|
'a \\ b\\',
|
||||||
|
# We replace \r with \n
|
||||||
|
('a\r\ra', 'a\n\na'),
|
||||||
|
]
|
||||||
|
|
||||||
def run_shell(args):
|
def run_shell(args):
|
||||||
stdout, stderr, error = Popen.run(
|
stdout, stderr, error = Popen.run(
|
||||||
args, text=True, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
args, text=True, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||||
|
@ -2067,15 +2082,15 @@ Line 1
|
||||||
assert not error
|
assert not error
|
||||||
return stdout
|
return stdout
|
||||||
|
|
||||||
# Test escaping
|
for argument in tests:
|
||||||
assert run_shell(['echo', 'test"&']) == '"test""&"\n'
|
if isinstance(argument, str):
|
||||||
assert run_shell(['echo', '%CMDCMDLINE:~-1%&']) == '"%CMDCMDLINE:~-1%&"\n'
|
expected = argument
|
||||||
assert run_shell(['echo', 'a\nb']) == '"a"\n"b"\n'
|
else:
|
||||||
assert run_shell(['echo', '"']) == '""""\n'
|
argument, expected = argument
|
||||||
assert run_shell(['echo', '\\']) == '\\\n'
|
|
||||||
# Test if delayed expansion is disabled
|
args = [sys.executable, '-c', 'import sys; print(end=sys.argv[1])', argument, 'end']
|
||||||
assert run_shell(['echo', '^!']) == '"^!"\n'
|
assert run_shell(args) == expected
|
||||||
assert run_shell('echo "^!"') == '"^!"\n'
|
assert run_shell(shell_quote(args, shell=True)) == expected
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|
|
@ -69,6 +69,10 @@ def _get_variant_and_executable_path():
|
||||||
# Ref: https://en.wikipedia.org/wiki/Uname#Examples
|
# Ref: https://en.wikipedia.org/wiki/Uname#Examples
|
||||||
if machine[1:] in ('x86', 'x86_64', 'amd64', 'i386', 'i686'):
|
if machine[1:] in ('x86', 'x86_64', 'amd64', 'i386', 'i686'):
|
||||||
machine = '_x86' if platform.architecture()[0][:2] == '32' else ''
|
machine = '_x86' if platform.architecture()[0][:2] == '32' else ''
|
||||||
|
# sys.executable returns a /tmp/ path for staticx builds (linux_static)
|
||||||
|
# Ref: https://staticx.readthedocs.io/en/latest/usage.html#run-time-information
|
||||||
|
if static_exe_path := os.getenv('STATICX_PROG_PATH'):
|
||||||
|
path = static_exe_path
|
||||||
return f'{remove_end(sys.platform, "32")}{machine}_exe', path
|
return f'{remove_end(sys.platform, "32")}{machine}_exe', path
|
||||||
|
|
||||||
path = os.path.dirname(__file__)
|
path = os.path.dirname(__file__)
|
||||||
|
|
|
@ -1638,16 +1638,14 @@ def get_filesystem_encoding():
|
||||||
return encoding if encoding is not None else 'utf-8'
|
return encoding if encoding is not None else 'utf-8'
|
||||||
|
|
||||||
|
|
||||||
_WINDOWS_QUOTE_TRANS = str.maketrans({'"': '\\"', '\\': '\\\\'})
|
_WINDOWS_QUOTE_TRANS = str.maketrans({'"': R'\"'})
|
||||||
_CMD_QUOTE_TRANS = str.maketrans({
|
_CMD_QUOTE_TRANS = str.maketrans({
|
||||||
# Keep quotes balanced by replacing them with `""` instead of `\\"`
|
# Keep quotes balanced by replacing them with `""` instead of `\\"`
|
||||||
'"': '""',
|
'"': '""',
|
||||||
# Requires a variable `=` containing `"^\n\n"` (set in `utils.Popen`)
|
# These require an env-variable `=` containing `"^\n\n"` (set in `utils.Popen`)
|
||||||
# `=` should be unique since variables containing `=` cannot be set using cmd
|
# `=` should be unique since variables containing `=` cannot be set using cmd
|
||||||
'\n': '%=%',
|
'\n': '%=%',
|
||||||
# While we are only required to escape backslashes immediately before quotes,
|
'\r': '%=%',
|
||||||
# we instead escape all of 'em anyways to be consistent
|
|
||||||
'\\': '\\\\',
|
|
||||||
# Use zero length variable replacement so `%` doesn't get expanded
|
# Use zero length variable replacement so `%` doesn't get expanded
|
||||||
# `cd` is always set as long as extensions are enabled (`/E:ON` in `utils.Popen`)
|
# `cd` is always set as long as extensions are enabled (`/E:ON` in `utils.Popen`)
|
||||||
'%': '%%cd:~,%',
|
'%': '%%cd:~,%',
|
||||||
|
@ -1656,19 +1654,14 @@ _CMD_QUOTE_TRANS = str.maketrans({
|
||||||
|
|
||||||
def shell_quote(args, *, shell=False):
|
def shell_quote(args, *, shell=False):
|
||||||
args = list(variadic(args))
|
args = list(variadic(args))
|
||||||
if any(isinstance(item, bytes) for item in args):
|
|
||||||
deprecation_warning('Passing bytes to utils.shell_quote is deprecated')
|
|
||||||
encoding = get_filesystem_encoding()
|
|
||||||
for index, item in enumerate(args):
|
|
||||||
if isinstance(item, bytes):
|
|
||||||
args[index] = item.decode(encoding)
|
|
||||||
|
|
||||||
if compat_os_name != 'nt':
|
if compat_os_name != 'nt':
|
||||||
return shlex.join(args)
|
return shlex.join(args)
|
||||||
|
|
||||||
trans = _CMD_QUOTE_TRANS if shell else _WINDOWS_QUOTE_TRANS
|
trans = _CMD_QUOTE_TRANS if shell else _WINDOWS_QUOTE_TRANS
|
||||||
return ' '.join(
|
return ' '.join(
|
||||||
s if re.fullmatch(r'[\w#$*\-+./:?@\\]+', s, re.ASCII) else s.translate(trans).join('""')
|
s if re.fullmatch(r'[\w#$*\-+./:?@\\]+', s, re.ASCII)
|
||||||
|
else re.sub(r'(\\+)("|$)', r'\1\1\2', s).translate(trans).join('""')
|
||||||
for s in args)
|
for s in args)
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue