From 1809a2ab54b23bde4194858986fe13ffa5408cbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B6=B5=E6=9B=A6?= Date: Mon, 1 Jul 2024 11:14:55 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D=20a?= =?UTF-8?q?rmv7=20=E7=9A=84=20ffmpeg=20=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 1 + install_dependencies.sh | 22 ++++++++++++++++------ pdm.lock | 18 +++++++++--------- pyproject.toml | 2 +- requirements.txt | 12 ++++++------ 5 files changed, 33 insertions(+), 22 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7572894..4fcd490 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ FROM python:3.10 AS builder +ENV DEBIAN_FRONTEND=noninteractive WORKDIR /app COPY requirements.txt . RUN python3 -m venv .venv && .venv/bin/pip install --no-cache-dir -r requirements.txt diff --git a/install_dependencies.sh b/install_dependencies.sh index 9830a24..079efaa 100644 --- a/install_dependencies.sh +++ b/install_dependencies.sh @@ -4,14 +4,24 @@ # https://github.com/yt-dlp/yt-dlp#dependencies # 判断系统架构 -arch=$(arch) +arch=$(uname -m) -pkg=ffmpeg-master-latest-linuxarm64-gpl +pkg="none" if [[ "${arch}" == "x86_64" ]]; then pkg=ffmpeg-master-latest-linux64-gpl +elif [[ "${arch}" == "arm64" ]]; then + pkg=ffmpeg-master-latest-linuxarm64-gpl fi -#export ALL_PROXY=http://192.168.2.5:8080 -wget https://github.com/yt-dlp/FFmpeg-Builds/releases/download/latest/$pkg.tar.xz -tar -xvJf $pkg.tar.xz -mv $pkg ffmpeg +if [[ "${pkg}" != "none" ]]; then + wget https://github.com/yt-dlp/FFmpeg-Builds/releases/download/latest/$pkg.tar.xz + tar -xvJf $pkg.tar.xz + mv $pkg ffmpeg +else + apt-get update + apt-get install -y ffmpeg + rm -rf /var/lib/apt/lists/* + mkdir -p /app/ffmpeg/bin + ln -s /usr/bin/ffmpeg /app/ffmpeg/bin/ffmpeg + ln -s /usr/bin/ffprobe /app/ffmpeg/bin/ffprobe +fi diff --git a/pdm.lock b/pdm.lock index 76dc310..9b3f044 100644 --- a/pdm.lock +++ b/pdm.lock @@ -5,7 +5,7 @@ groups = ["default", "lint"] strategy = ["cross_platform"] lock_version = "4.4.1" -content_hash = "sha256:813253734c7d7835a76cd87fe8fe0329e02ad067f535aee6a9e11cb106569dd2" +content_hash = "sha256:e7455b13bf13306ccf5ad11781191edb62991d9fbe8f8ce1e61a2f35c713cc2a" [[package]] name = "aiohttp" @@ -632,8 +632,8 @@ files = [ [[package]] name = "requests" -version = "2.32.3" -requires_python = ">=3.8" +version = "2.31.0" +requires_python = ">=3.7" summary = "Python HTTP for Humans." dependencies = [ "certifi>=2017.4.17", @@ -642,8 +642,8 @@ dependencies = [ "urllib3<3,>=1.21.1", ] files = [ - {file = "requests-2.32.3-py3-none-any.whl", hash = "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6"}, - {file = "requests-2.32.3.tar.gz", hash = "sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760"}, + {file = "requests-2.31.0-py3-none-any.whl", hash = "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f"}, + {file = "requests-2.31.0.tar.gz", hash = "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"}, ] [[package]] @@ -832,7 +832,7 @@ files = [ [[package]] name = "yt-dlp" -version = "2024.6.30.232744.dev0" +version = "2024.5.30.232720.dev0" requires_python = ">=3.8" summary = "A feature-rich command-line audio/video downloader" dependencies = [ @@ -841,11 +841,11 @@ dependencies = [ "certifi", "mutagen", "pycryptodomex", - "requests<3,>=2.32.2", + "requests<3,>=2.31.0", "urllib3<3,>=1.26.17", "websockets>=12.0", ] files = [ - {file = "yt_dlp-2024.6.30.232744.dev0-py3-none-any.whl", hash = "sha256:62e0086b18ac5449277e9d9366ead4eb9e1ba0db23c607ad076da07f945fc1ea"}, - {file = "yt_dlp-2024.6.30.232744.dev0.tar.gz", hash = "sha256:06dedc2e6b007a64d7f4019fe4f5773f1d6b9421d9f5f58df9e3233ce9683d5b"}, + {file = "yt_dlp-2024.5.30.232720.dev0-py3-none-any.whl", hash = "sha256:d6e563a2923807392325722028e7792e35affb694a505617b008195d0d212d2c"}, + {file = "yt_dlp-2024.5.30.232720.dev0.tar.gz", hash = "sha256:9e2b177c5b13ea6f54cee1c56a69dd7832d506fba73a2247c6470e7d1952f959"}, ] diff --git a/pyproject.toml b/pyproject.toml index a34406a..e23a3f0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ authors = [ {name = "涵曦", email = "im.hanxi@gmail.com"}, ] dependencies = [ - "requests>=2.31.0", + "requests==2.31.0", "aiohttp>=3.8.6", "miservice-fork>=2.5.0", "mutagen>=1.47.0", diff --git a/requirements.txt b/requirements.txt index 9cca28b..dfc26b1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -371,9 +371,9 @@ pycryptodomex==3.19.0 \ pygments==2.16.1 \ --hash=sha256:13fc09fa63bc8d8671a6d247e1eb303c4b343eaee81d861f3404db2935653692 \ --hash=sha256:1daff0494820c69bc8941e407aa20f577374ee88364ee10a98fdbe0aece96e29 -requests==2.32.3 \ - --hash=sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760 \ - --hash=sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6 +requests==2.31.0 \ + --hash=sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f \ + --hash=sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1 rich==13.7.1 \ --hash=sha256:4edbae314f59eb482f54e9e30bf00d33350aaa94f4bfcd4e9e3110e64d0d7222 \ --hash=sha256:9be308cb1fe2f1f57d67ce99e95af38a1e2bc71ad9813b0e247cf7ffbcc3a432 @@ -472,6 +472,6 @@ yarl==1.9.2 \ --hash=sha256:d4e2c6d555e77b37288eaf45b8f60f0737c9efa3452c6c44626a5455aeb250b9 \ --hash=sha256:e9fdc7ac0d42bc3ea78818557fab03af6181e076a2944f43c38684b4b6bed8e3 \ --hash=sha256:ee4afac41415d52d53a9833ebae7e32b344be72835bbb589018c9e938045a560 -yt-dlp==2024.6.30.232744.dev0 \ - --hash=sha256:06dedc2e6b007a64d7f4019fe4f5773f1d6b9421d9f5f58df9e3233ce9683d5b \ - --hash=sha256:62e0086b18ac5449277e9d9366ead4eb9e1ba0db23c607ad076da07f945fc1ea +yt-dlp==2024.5.30.232720.dev0 \ + --hash=sha256:9e2b177c5b13ea6f54cee1c56a69dd7832d506fba73a2247c6470e7d1952f959 \ + --hash=sha256:d6e563a2923807392325722028e7792e35affb694a505617b008195d0d212d2c