From 3e249e05896efd3046bb571d46a7123b7420f0ee Mon Sep 17 00:00:00 2001 From: Jesse Bannon Date: Sat, 19 Nov 2022 23:29:39 -0800 Subject: [PATCH] fix ytdl options --- .../subscription_ytdl_options.py | 32 ++++++++----------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/src/ytdl_sub/subscriptions/subscription_ytdl_options.py b/src/ytdl_sub/subscriptions/subscription_ytdl_options.py index 34c329f5..b5c52be4 100644 --- a/src/ytdl_sub/subscriptions/subscription_ytdl_options.py +++ b/src/ytdl_sub/subscriptions/subscription_ytdl_options.py @@ -108,6 +108,7 @@ class SubscriptionYTDLOptions: """ return YTDLOptionsBuilder().add( self._global_options, + self._output_options, self._plugin_ytdl_options(DateRangePlugin), self._user_ytdl_options, # user ytdl options... self._info_json_only_options, # then info_json_only options @@ -120,25 +121,18 @@ class SubscriptionYTDLOptions: YTDLOptionsBuilder Builder with values set based on the subscription for actual downloading """ - ytdl_options_builder = YTDLOptionsBuilder().add(self._global_options) + ytdl_options_builder = YTDLOptionsBuilder().add( + self._global_options, + self._output_options, + self._plugin_ytdl_options(DateRangePlugin), + self._plugin_ytdl_options(FileConvertPlugin), + self._plugin_ytdl_options(SubtitlesPlugin), + self._plugin_ytdl_options(ChaptersPlugin), + self._plugin_ytdl_options(AudioExtractPlugin), + self._user_ytdl_options, # user ytdl options... + ) + # Add dry run options last if enabled if self._dry_run: - ytdl_options_builder.add( - self._plugin_ytdl_options(DateRangePlugin), - self._plugin_ytdl_options(FileConvertPlugin), - self._plugin_ytdl_options(SubtitlesPlugin), - self._plugin_ytdl_options(ChaptersPlugin), - self._user_ytdl_options, # user ytdl options... - self._dry_run_options, # then dry-run - ) - else: - ytdl_options_builder.add( - self._output_options, - self._plugin_ytdl_options(DateRangePlugin), - self._plugin_ytdl_options(FileConvertPlugin), - self._plugin_ytdl_options(SubtitlesPlugin), - self._plugin_ytdl_options(ChaptersPlugin), - self._plugin_ytdl_options(AudioExtractPlugin), - self._user_ytdl_options, # user ytdl options last - ) + ytdl_options_builder.add(self._dry_run_options) return ytdl_options_builder