diff --git a/Dockerfile b/Dockerfile index 2850fb80..4b13a985 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,9 +25,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # install requirements COPY ./backend/requirements.txt /requirements.txt -COPY ./backend/requirements.plugins.txt /requirements.plugins.txt -RUN pip install --user -r /requirements.txt \ - && python -m pip install --target /opt/yt_plugins/bgutil -r /requirements.plugins.txt +RUN pip install --user -r requirements.txt # build ffmpeg FROM python:3.13.11-slim-trixie AS ffmpeg-builder @@ -48,7 +46,6 @@ COPY --from=denoland/deno:bin /deno /usr/local/bin/deno # copy build requirements COPY --from=builder /root/.local /root/.local -COPY --from=builder /opt/yt_plugins /opt/yt_plugins ENV PATH=/root/.local/bin:$PATH # copy ffmpeg diff --git a/backend/download/src/yt_dlp_base.py b/backend/download/src/yt_dlp_base.py index ea65ca77..152d1b3a 100644 --- a/backend/download/src/yt_dlp_base.py +++ b/backend/download/src/yt_dlp_base.py @@ -78,9 +78,17 @@ class YtWrap: } }, ) - if EnvironmentSettings.APP_DIR == "/app": - # container internal only - self.obs["plugin_dirs"].append("/opt/yt_plugins/bgutil") + return + + # from fork: https://github.com/bbilly1/bgutil-ytdlp-pot-provider + deep_merge( + self.obs, + { + "extractor_args": { + "youtubepot-bgutilhttp": {"disable": ["True"]} + } + }, + ) def download(self, url): """make download request""" diff --git a/backend/requirements.plugins.txt b/backend/requirements.plugins.txt deleted file mode 100644 index eaaf09fd..00000000 --- a/backend/requirements.plugins.txt +++ /dev/null @@ -1,2 +0,0 @@ -# install plugins in separate folder for runtime whitelisting -bgutil-ytdlp-pot-provider==1.3.1 diff --git a/backend/requirements.txt b/backend/requirements.txt index c22e4a5c..2188c23b 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -1,4 +1,5 @@ apprise==1.9.9 +bgutil-ytdlp-pot-provider @ git+https://github.com/bbilly1/bgutil-ytdlp-pot-provider@68578674650bade31cd77fb80ce84f7045191ba7#subdirectory=plugin celery==5.6.3 deepdiff==9.0.0 django-auth-ldap==5.3.0 diff --git a/requirements-dev.txt b/requirements-dev.txt index 4954f398..ca88ff7e 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,4 +1,3 @@ --r backend/requirements.plugins.txt -r backend/requirements.txt ipython==9.12.0 pre-commit==4.5.1