From 9a3e513b6c053a8ba0752140f5df50ca3b9672c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B6=B5=E6=9B=A6?= Date: Tue, 2 Jul 2024 03:11:17 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8D=87=E7=BA=A7yt-dlp=E5=88=B02024.07?= =?UTF-8?q?.01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install_dependencies.sh | 3 ++- pdm.lock | 18 +++++++++--------- pyproject.toml | 3 +-- requirements.txt | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/install_dependencies.sh b/install_dependencies.sh index f79c5dd..c0b86e5 100644 --- a/install_dependencies.sh +++ b/install_dependencies.sh @@ -30,7 +30,8 @@ case "$arch" in x86_64) echo "64位 x86 架构" pkg=ffmpeg-master-latest-linux64-gpl - install_from_build "$pkg" + #install_from_build "$pkg" + install_from_apt ;; arm64 | aarch64) echo "64位 ARM 架构" diff --git a/pdm.lock b/pdm.lock index 9b3f044..0f0ea94 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:e7455b13bf13306ccf5ad11781191edb62991d9fbe8f8ce1e61a2f35c713cc2a" +content_hash = "sha256:ac53cf6421de7aded8475907adc40a716a3e5c6429c614b93e5cfbddea36d048" [[package]] name = "aiohttp" @@ -632,8 +632,8 @@ files = [ [[package]] name = "requests" -version = "2.31.0" -requires_python = ">=3.7" +version = "2.32.3" +requires_python = ">=3.8" summary = "Python HTTP for Humans." dependencies = [ "certifi>=2017.4.17", @@ -642,8 +642,8 @@ dependencies = [ "urllib3<3,>=1.21.1", ] files = [ - {file = "requests-2.31.0-py3-none-any.whl", hash = "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f"}, - {file = "requests-2.31.0.tar.gz", hash = "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"}, + {file = "requests-2.32.3-py3-none-any.whl", hash = "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6"}, + {file = "requests-2.32.3.tar.gz", hash = "sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760"}, ] [[package]] @@ -832,7 +832,7 @@ files = [ [[package]] name = "yt-dlp" -version = "2024.5.30.232720.dev0" +version = "2024.7.1.232715.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.31.0", + "requests<3,>=2.32.2", "urllib3<3,>=1.26.17", "websockets>=12.0", ] files = [ - {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"}, + {file = "yt_dlp-2024.7.1.232715.dev0-py3-none-any.whl", hash = "sha256:e9ab443353da0c8f01587b031fb84b2cc42eae82aeaa03a9ce5ed6edc301b503"}, + {file = "yt_dlp-2024.7.1.232715.dev0.tar.gz", hash = "sha256:4f1ab25318c9156cca0b7308bdd2aeb3e7f01e8d9fb83916b4719010038170c8"}, ] diff --git a/pyproject.toml b/pyproject.toml index 9571a00..75d3f3c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,11 +6,10 @@ authors = [ {name = "涵曦", email = "im.hanxi@gmail.com"}, ] dependencies = [ - "requests==2.31.0", "aiohttp>=3.8.6", "miservice-fork>=2.5.0", "mutagen>=1.47.0", - "yt-dlp>=2024.04.09", + "yt-dlp>=2024.07.01", "flask[async]>=3.0.1", "waitress>=3.0.0", "flask-HTTPAuth>=4.8.0", diff --git a/requirements.txt b/requirements.txt index dfc26b1..3a6ac63 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.31.0 \ - --hash=sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f \ - --hash=sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1 +requests==2.32.3 \ + --hash=sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760 \ + --hash=sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6 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.5.30.232720.dev0 \ - --hash=sha256:9e2b177c5b13ea6f54cee1c56a69dd7832d506fba73a2247c6470e7d1952f959 \ - --hash=sha256:d6e563a2923807392325722028e7792e35affb694a505617b008195d0d212d2c +yt-dlp==2024.7.1.232715.dev0 \ + --hash=sha256:4f1ab25318c9156cca0b7308bdd2aeb3e7f01e8d9fb83916b4719010038170c8 \ + --hash=sha256:e9ab443353da0c8f01587b031fb84b2cc42eae82aeaa03a9ce5ed6edc301b503