From 9719ac863f314ef8af89d39b3f2ed248b29834f5 Mon Sep 17 00:00:00 2001 From: ArabCoders Date: Sat, 9 Mar 2024 18:22:18 +0300 Subject: [PATCH 1/3] Added yt-dlp version to footer. --- Pipfile.lock | 16 ++++++++-------- app/Config.py | 8 +++++--- frontend/src/App.vue | 3 ++- frontend/src/components/Page-Footer.vue | 9 ++++++++- 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index e3f8b966..1df8b6ff 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -349,11 +349,11 @@ }, "croniter": { "hashes": [ - "sha256:4cb064ce2d8f695b3b078be36ff50115cf8ac306c10a7e8653ee2a5b534673d7", - "sha256:d199b2ec3ea5e82988d1f72022433c5f9302b3b3ea9e6bfd6a1518f6ea5e700a" + "sha256:78bf110a2c7dbbfdd98b926318ae6c64a731a4c637c7befe3685755110834746", + "sha256:8bff16c9af4ef1fb6f05416973b8f7cb54997c02f2f8365251f9bf1dded91866" ], "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==2.0.1" + "version": "==2.0.2" }, "debugpy": { "hashes": [ @@ -635,11 +635,11 @@ }, "python-dateutil": { "hashes": [ - "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86", - "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9" + "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3", + "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==2.8.2" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", + "version": "==2.9.0.post0" }, "python-dotenv": { "hashes": [ @@ -704,7 +704,7 @@ "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", "version": "==1.16.0" }, "tzlocal": { diff --git a/app/Config.py b/app/Config.py index 713c94c8..0847dc70 100644 --- a/app/Config.py +++ b/app/Config.py @@ -6,7 +6,7 @@ import sys import coloredlogs from version import APP_VERSION from dotenv import load_dotenv - +from yt_dlp.version import __version__ as YTDLP_VERSION class Config: __instance = None @@ -44,11 +44,13 @@ class Config: debug: bool = False new_version_available: bool = False - + extract_info_timeout: int = 70 + ytdlp_version: str = YTDLP_VERSION + _int_vars: tuple = ('port', 'max_workers',) - _immutable: tuple = ('version', '__instance', 'ytdl_options', 'new_version_available') + _immutable: tuple = ('version', '__instance', 'ytdl_options', 'new_version_available', 'ytdlp_version',) _boolean_vars: tuple = ('keep_archive', 'ytdl_debug', 'debug', 'temp_keep', 'allow_manifestless',) @staticmethod diff --git a/frontend/src/App.vue b/frontend/src/App.vue index d7298841..e375391f 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -15,7 +15,8 @@ - + From 29bff397b34c5a10f7a77b8f815ff2e1a6fc5eaa Mon Sep 17 00:00:00 2001 From: ArabCoders Date: Sat, 9 Mar 2024 18:31:49 +0300 Subject: [PATCH 2/3] updated yt-dlp to pre-version --- Dockerfile | 4 ++-- Pipfile.lock | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4906dd72..5efe8c34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,9 +17,9 @@ RUN apk add --update coreutils curl gcc g++ musl-dev libffi-dev openssl-dev && p WORKDIR /app +ARG PIPENV_FLAGS="--deploy" COPY ./Pipfile* . - -RUN PIPENV_VENV_IN_PROJECT=1 pipenv install --deploy +RUN PIPENV_VENV_IN_PROJECT=1 pipenv install ${PIPENV_FLAGS} FROM python:3.11-alpine diff --git a/Pipfile.lock b/Pipfile.lock index 1df8b6ff..fc9531a2 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -907,12 +907,12 @@ }, "yt-dlp": { "hashes": [ - "sha256:a11862e57721b0a0f0883dfeb5a4d79ba213a2d4c45e1880e9fd70f8e6570c38", - "sha256:c00d9a71d64472ad441bcaa1ec0c3797d6e60c9f934f270096a96fe51657e7b3" + "sha256:2e0ee4bc26873b4fafe3236dfbaeb0f1abb1f556fcc69b4c0741ef3f8da91ca1", + "sha256:d82904ba86ae5fa002924ec497633e1ae6f739c3a2c2b23cc61ba581eef7a649" ], "index": "pypi", "markers": "python_version >= '3.8'", - "version": "==2023.12.30" + "version": "==2024.3.8.232718.dev0" } }, "develop": {} From 68ff625a473ae74f531862d94be47f6eb2c980f6 Mon Sep 17 00:00:00 2001 From: ArabCoders Date: Mon, 11 Mar 2024 19:18:44 +0300 Subject: [PATCH 3/3] Update yt-dlp branch target --- .github/workflows/update-yt-dlp.yml | 4 +++- Pipfile.lock | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/update-yt-dlp.yml b/.github/workflows/update-yt-dlp.yml index dbf11ac2..d5802956 100644 --- a/.github/workflows/update-yt-dlp.yml +++ b/.github/workflows/update-yt-dlp.yml @@ -21,6 +21,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + with: + ref: "dev" - name: Set up Python uses: actions/setup-python@v4 with: @@ -38,7 +40,7 @@ jobs: - name: Create Pull Request uses: peter-evans/create-pull-request@v5 with: - title: "Update yt-dlp" + title: "[yt-dlp] automated update to ${{ steps.ytdlp_update.outputs.YTLDLP_VER }}" commit-message: "Update yt-dlp to ${{ steps.ytdlp_update.outputs.YTLDLP_VER }}" body: "This is an automated request to update yt-dlp dependency to ${{ steps.ytdlp_update.outputs.YTLDLP_VER }}" delete-branch: true diff --git a/Pipfile.lock b/Pipfile.lock index fc9531a2..b7a8d40c 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -638,7 +638,7 @@ "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3", "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.9.0.post0" }, "python-dotenv": { @@ -704,7 +704,7 @@ "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.16.0" }, "tzlocal": { @@ -907,12 +907,12 @@ }, "yt-dlp": { "hashes": [ - "sha256:2e0ee4bc26873b4fafe3236dfbaeb0f1abb1f556fcc69b4c0741ef3f8da91ca1", - "sha256:d82904ba86ae5fa002924ec497633e1ae6f739c3a2c2b23cc61ba581eef7a649" + "sha256:6e74cb14a69dbeb872c8ef4e0b8bbed2ee846ec633513cf3124a74c1faedc07b", + "sha256:bbe66b9a3aa23b6378ccca3ea20f5aadf385fa21a993513a105d73c827a86ed4" ], "index": "pypi", "markers": "python_version >= '3.8'", - "version": "==2024.3.8.232718.dev0" + "version": "==2024.3.10" } }, "develop": {}