danvics/ytdl-sub
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

min 2

Browse source
This commit is contained in:
Jesse Bannon 2024-01-04 15:20:55 -08:00
parent 2dbe426ced
commit 87aa5e78cd
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ytdl_sub/subscriptions/subscription_download.py
View file

@ -343,6 +343,7 @@ class SubscriptionDownload(BaseSubscription, ABC):
preset=self._preset_options, preset=self._preset_options,
plugins=plugins, plugins=plugins,
enhanced_download_archive=self._enhanced_download_archive, enhanced_download_archive=self._enhanced_download_archive,
overrides=self.overrides,
working_directory=self.working_directory, working_directory=self.working_directory,
dry_run=dry_run, dry_run=dry_run,
) )
@ -395,6 +396,7 @@ class SubscriptionDownload(BaseSubscription, ABC):
preset=self._preset_options, preset=self._preset_options,
plugins=plugins, plugins=plugins,
enhanced_download_archive=self._enhanced_download_archive, enhanced_download_archive=self._enhanced_download_archive,
overrides=self.overrides,
working_directory=self.working_directory, working_directory=self.working_directory,
dry_run=dry_run, dry_run=dry_run,
) )

8
src/ytdl_sub/subscriptions/subscription_ytdl_options.py
View file

@ -7,6 +7,7 @@ from typing import TypeVar
from yt_dlp import match_filter_func from yt_dlp import match_filter_func
from ytdl_sub.config.overrides import Overrides
from ytdl_sub.config.plugin.plugin import Plugin from ytdl_sub.config.plugin.plugin import Plugin
from ytdl_sub.config.preset import Preset from ytdl_sub.config.preset import Preset
from ytdl_sub.downloaders.ytdl_options_builder import YTDLOptionsBuilder from ytdl_sub.downloaders.ytdl_options_builder import YTDLOptionsBuilder
@ -33,12 +34,14 @@ class SubscriptionYTDLOptions:
preset: Preset, preset: Preset,
plugins: List[Plugin], plugins: List[Plugin],
enhanced_download_archive: EnhancedDownloadArchive, enhanced_download_archive: EnhancedDownloadArchive,
overrides: Overrides,
working_directory: str, working_directory: str,
dry_run: bool, dry_run: bool,
): ):
self._preset = preset self._preset = preset
self._plugins = plugins self._plugins = plugins
self._enhanced_download_archive = enhanced_download_archive self._enhanced_download_archive = enhanced_download_archive
self._overrides = overrides
self._working_directory = working_directory self._working_directory = working_directory
self._dry_run = dry_run self._dry_run = dry_run
@ -90,6 +93,11 @@ class SubscriptionYTDLOptions:
if self._preset.output_options.maintain_download_archive: if self._preset.output_options.maintain_download_archive:
ytdl_options["download_archive"] = self._enhanced_download_archive.working_file_path ytdl_options["download_archive"] = self._enhanced_download_archive.working_file_path
if self._preset.output_options.keep_max_files:
# yt-dlp has a weird bug with max_downloads=1, set to 2 for safe measure
ytdl_options["max_downloads"] = max(
int(self._overrides.apply_formatter(self._preset.output_options.keep_max_files)), 2
)
return ytdl_options return ytdl_options