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

update with more optimized ytdl options

Browse source
This commit is contained in:
Jesse Bannon 2022-11-16 12:06:58 -08:00
parent 72b1901e34
commit 7a2cb19274
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ytdl_sub/downloaders/downloader.py
View file

@ -37,6 +37,7 @@ from ytdl_sub.entries.variables.kwargs import DOWNLOAD_INDEX
from ytdl_sub.entries.variables.kwargs import PLAYLIST_ENTRY from ytdl_sub.entries.variables.kwargs import PLAYLIST_ENTRY
from ytdl_sub.entries.variables.kwargs import REQUESTED_SUBTITLES from ytdl_sub.entries.variables.kwargs import REQUESTED_SUBTITLES
from ytdl_sub.entries.variables.kwargs import SOURCE_ENTRY from ytdl_sub.entries.variables.kwargs import SOURCE_ENTRY
from ytdl_sub.entries.variables.kwargs import SPONSORBLOCK_CHAPTERS
from ytdl_sub.entries.variables.kwargs import UPLOAD_DATE_INDEX from ytdl_sub.entries.variables.kwargs import UPLOAD_DATE_INDEX
from ytdl_sub.thread.log_entries_downloaded_listener import LogEntriesDownloadedListener from ytdl_sub.thread.log_entries_downloaded_listener import LogEntriesDownloadedListener
from ytdl_sub.utils.exceptions import FileNotDownloadedException from ytdl_sub.utils.exceptions import FileNotDownloadedException
@ -448,8 +449,10 @@ class Downloader(DownloadArchiver, Generic[DownloaderOptionsT], ABC):
entry.add_kwargs( entry.add_kwargs(
{ {
# Workaround for the yt-dlp issue that does not include subs in playlist downloads # Subtitles are not downloaded in metadata run, only here, so move over
REQUESTED_SUBTITLES: download_entry.kwargs_get(REQUESTED_SUBTITLES), REQUESTED_SUBTITLES: download_entry.kwargs_get(REQUESTED_SUBTITLES),
# Same with sponsorblock chapters
SPONSORBLOCK_CHAPTERS: download_entry.kwargs_get(SPONSORBLOCK_CHAPTERS),
# Tracks number of entries downloaded # Tracks number of entries downloaded
DOWNLOAD_INDEX: download_idx, DOWNLOAD_INDEX: download_idx,
# Tracks number of entries with the same upload date to make them unique # Tracks number of entries with the same upload date to make them unique

1
src/ytdl_sub/entries/variables/kwargs.py
View file

@ -43,6 +43,7 @@ PLAYLIST_UPLOADER_URL = _("playlist_uploader_url")
DOWNLOAD_INDEX = _("download_index", backend=True) DOWNLOAD_INDEX = _("download_index", backend=True)
UPLOAD_DATE_INDEX = _("upload_date_index", backend=True) UPLOAD_DATE_INDEX = _("upload_date_index", backend=True)
REQUESTED_SUBTITLES = _("requested_subtitles", backend=True) REQUESTED_SUBTITLES = _("requested_subtitles", backend=True)
SPONSORBLOCK_CHAPTERS = _("sponsorblock_chapters", backend=True)
UID = _("id") UID = _("id")
EXTRACTOR = _("extractor") EXTRACTOR = _("extractor")
EPOCH = _("epoch") EPOCH = _("epoch")

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

@ -249,7 +249,8 @@ class SubscriptionDownload(BaseSubscription, ABC):
downloader = self.downloader_class( downloader = self.downloader_class(
download_options=self.downloader_options, download_options=self.downloader_options,
enhanced_download_archive=self._enhanced_download_archive, enhanced_download_archive=self._enhanced_download_archive,
subscription_ytdl_options=subscription_ytdl_options, download_ytdl_options=subscription_ytdl_options.download_builder(),
metadata_ytdl_options=subscription_ytdl_options.metadata_builder(),
overrides=self.overrides, overrides=self.overrides,
) )

6
tests/resources/expected_downloads_summaries/plugins/test_audio_extract_playlist.json
View file

@ -1,5 +1,5 @@
{ {
"Jesse's Minecraft Server [Trailer - Feb.1].ogg": "afb2264e271e3c464d0fe9ba0db37f88", "Jesse's Minecraft Server [Trailer - Feb.1].ogg": "0d4509c21883fbc46584d25f6ec4fd80",
"Jesse's Minecraft Server [Trailer - Feb.27].ogg": "6f322d842a1e43b4c9981b42423d9b4c", "Jesse's Minecraft Server [Trailer - Feb.27].ogg": "7ab2863ee0e1c215102c4512085f877d",
"Jesse's Minecraft Server [Trailer - Mar.21].ogg": "fe1dc3361a102661c27020d5b95a2a81" "Jesse's Minecraft Server [Trailer - Mar.21].ogg": "ed6a54d5b3ec6303ea6a175e02c69511"
} }