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/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 01d60b15..b7a8d40c 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" + "version": "==2.9.0.post0" }, "python-dotenv": { "hashes": [ 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 @@ - +