diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index a14581f..047f3a4 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/devcontainers/python:1-3.12-bullseye # Install the xz-utils package -RUN apt-get update && apt-get install -y curl xz-utils tzdata git +RUN apt-get update && apt-get install -y curl xz-utils tzdata git gnupg2 # Install Node.js RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - &&\ @@ -37,5 +37,11 @@ ENV PYTHONPATH "${PYTHONPATH}:/app/backend" COPY dev-start.sh /usr/local/bin/startup.sh RUN chmod +x /usr/local/bin/startup.sh +# For GPG signing +RUN echo 'export GPG_TTY=$(tty)' >> /root/.bashrc +RUN echo 'export GPG_TTY=$(tty)' >> /home/vscode/.bashrc +RUN echo 'gpg-connect-agent updatestartuptty /bye >/dev/null' >> /root/.bashrc +RUN echo 'gpg-connect-agent updatestartuptty /bye >/dev/null' >> /home/vscode/.bashrc + # Expose the port the app runs on EXPOSE 7888 diff --git a/backend/core/download/video.py b/backend/core/download/video.py index fae8ebd..f560cca 100644 --- a/backend/core/download/video.py +++ b/backend/core/download/video.py @@ -123,6 +123,7 @@ def _get_ytdl_options() -> dict[str, Any]: "postprocessor_args": {}, } if app_settings.yt_cookies_path: + logger.debug(f"Using cookies file: {app_settings.yt_cookies_path}") ydl_options["cookiefile"] = f"{app_settings.yt_cookies_path}" postprocessors: list[dict] = [] output_options: list[str] = [] diff --git a/backend/core/tasks/download_trailers.py b/backend/core/tasks/download_trailers.py index ebf0c0e..a744ab3 100644 --- a/backend/core/tasks/download_trailers.py +++ b/backend/core/tasks/download_trailers.py @@ -75,13 +75,15 @@ def _download_missing_media_trailers(is_movie: bool): logger.info( f"Skipping trailer download for {skip_count} {media_type}, waiting for media" ) - for skip_reason, skip_titles in skipped_titles: - if len(skip_titles) > 0: - all_titles = ", ".join(skip_titles) - else: - all_titles = "None" + for skip_reason in skipped_titles: + skip_titles = skipped_titles[skip_reason] + # if len(skip_titles) > 0: + # all_titles = ", ".join(skip_titles) + # else: + # all_titles = "None" skip_reason = skip_reason.replace("_", " ") - logger.debug(f"Skipped {len(skip_titles)} titles - {skip_reason}: {all_titles}") + logger.debug(f"Skipped {len(skip_titles)} titles - {skip_reason}") + # logger.debug(f"Skipped {len(skip_titles)} titles - {skip_reason}: {all_titles}") if not media_trailer_list: logger.info(f"No missing {media_type} trailers to download")