From 6b53b3bdeae635e5880dbdc5a4607e925b5f3c73 Mon Sep 17 00:00:00 2001 From: Jesse Bannon Date: Thu, 26 May 2022 22:38:24 -0700 Subject: [PATCH] ytdl-sub dl --youtube.video bugfixes (#40) * Fix error when maintain_download_archive=False, improve error message * edge pip in dockerfile, if for dl archive * lint --- docker/Dockerfile | 4 ++-- src/ytdl_sub/downloaders/downloader.py | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 47d8e234..657cbe3b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -18,8 +18,8 @@ RUN apk update && \ apk add --repository=http://dl-3.alpinelinux.org/alpine/edge/main/ \ python3=3.10.4-r0 \ py3-setuptools=59.4.0-r0 && \ - apk add --repository=http://dl-3.alpinelinux.org/alpine/edge/community/ \ - py3-pip=22.0.4-r0 && \ + apk add --repository=http://dl-3.alpinelinux.org/alpine/edge/community/ \ + py3-pip && \ mkdir -p /config && \ pip install --no-cache-dir ytdl_sub-*.whl && \ rm ytdl_sub-*.whl diff --git a/src/ytdl_sub/downloaders/downloader.py b/src/ytdl_sub/downloaders/downloader.py index 1055ac6f..7b388dfe 100644 --- a/src/ytdl_sub/downloaders/downloader.py +++ b/src/ytdl_sub/downloaders/downloader.py @@ -72,7 +72,10 @@ class Downloader(Generic[DownloaderOptionsT, DownloaderEntryT], ABC): ytdl_options["outtmpl"] = str(Path(working_directory) / "%(id)s.%(ext)s") # If a download archive file name is provided, set it to that - ytdl_options["download_archive"] = str(Path(working_directory) / download_archive_file_name) + if download_archive_file_name: + ytdl_options["download_archive"] = str( + Path(working_directory) / download_archive_file_name + ) return ytdl_options