diff --git a/modules/videos/downloader.py b/modules/videos/downloader.py index 44eb1f47..57902d25 100755 --- a/modules/videos/downloader.py +++ b/modules/videos/downloader.py @@ -163,6 +163,7 @@ class VideoDownloader(Downloader, ABC): str(YT_DLP_BIN), '-cw', # Continue downloads, do not clobber existing files. '-f', PREFERRED_VIDEO_FORMAT, + '--match-filter', '!is_live', # Do not attempt to download Live videos. '--write-subs', '--write-auto-subs', '--write-thumbnail', @@ -217,9 +218,8 @@ class VideoDownloader(Downloader, ABC): raise ValueError(f'Output directory does not exist! {out_dir=}') # YoutubeDL expects specific options, add onto the default options - config = get_downloader_config().dict() - options = config.copy() - options['outtmpl'] = f'{out_dir}/{config["file_name_format"]}' + options = get_downloader_config().dict() + options['outtmpl'] = f'{out_dir}/{options["file_name_format"]}' options['merge_output_format'] = PREFERRED_VIDEO_EXTENSION # We don't need "format" when getting the filename. del options['format'] diff --git a/wrolpi/downloader.py b/wrolpi/downloader.py index 19f58f45..1d32a472 100644 --- a/wrolpi/downloader.py +++ b/wrolpi/downloader.py @@ -590,7 +590,7 @@ class DownloadManager: return data @optional_session - def get_pending_downloads(self, session: Session): + def get_pending_downloads(self, session: Session) -> List[Download]: return session.query(Download).filter_by(status='pending').all() @optional_session diff --git a/wrolpi/version.py b/wrolpi/version.py index e7a1c603..164f8f52 100644 --- a/wrolpi/version.py +++ b/wrolpi/version.py @@ -1,4 +1,4 @@ -__version__ = '0.3.1-beta' +__version__ = '0.3.2-beta' import subprocess