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

Keep EXTRACTOR available but use KEYs

Browse source
This commit is contained in:
Qualis Svagtlys 2023-12-14 12:49:50 -06:00
parent 33d8e9ac7d
commit fd5d8b5bb5
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ytdl_sub/entries/base_entry.py
View file

@ -14,6 +14,7 @@ from yt_dlp.utils import sanitize_filename
from ytdl_sub.entries.variables.kwargs import DESCRIPTION from ytdl_sub.entries.variables.kwargs import DESCRIPTION
from ytdl_sub.entries.variables.kwargs import EPOCH from ytdl_sub.entries.variables.kwargs import EPOCH
from ytdl_sub.entries.variables.kwargs import EXTRACTOR from ytdl_sub.entries.variables.kwargs import EXTRACTOR
from ytdl_sub.entries.variables.kwargs import EXTRACTOR_KEY
from ytdl_sub.entries.variables.kwargs import IE_KEY from ytdl_sub.entries.variables.kwargs import IE_KEY
from ytdl_sub.entries.variables.kwargs import TITLE from ytdl_sub.entries.variables.kwargs import TITLE
from ytdl_sub.entries.variables.kwargs import UID from ytdl_sub.entries.variables.kwargs import UID
@ -100,12 +101,13 @@ class BaseEntryVariables:
Returns Returns
------- -------
str str
The ytdl extractor name The ytdl extractor key
""" """
# pylint: disable=line-too-long # pylint: disable=line-too-long
# Taken from https://github.com/yt-dlp/yt-dlp/blob/e6ab678e36c40ded0aae305bbb866cdab554d417/yt_dlp/YoutubeDL.py#L3514 # Taken from https://github.com/yt-dlp/yt-dlp/blob/e6ab678e36c40ded0aae305bbb866cdab554d417/yt_dlp/YoutubeDL.py#L3514
# pylint: enable=line-too-long # pylint: enable=line-too-long
return self.kwargs(EXTRACTOR) or self.kwargs(IE_KEY) # return EXTRACTOR_KEY, or IE_KEY if EXTRACTOR_KEY not present. EXTRACTOR is present but not used in yt-dlp code
return self.kwargs_get(EXTRACTOR_KEY) or self.kwargs(IE_KEY)
@property @property
def epoch(self: "BaseEntry") -> int: def epoch(self: "BaseEntry") -> int:

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

@ -51,7 +51,8 @@ SPONSORBLOCK_CHAPTERS = _("sponsorblock_chapters", backend=True)
SPLIT_BY_CHAPTERS_PARENT_ENTRY = _("split_by_chapters_parent_entry", backend=True) SPLIT_BY_CHAPTERS_PARENT_ENTRY = _("split_by_chapters_parent_entry", backend=True)
COMMENTS = _("comments", backend=True) COMMENTS = _("comments", backend=True)
UID = _("id") UID = _("id")
EXTRACTOR = _("extractor_key") # EXTRACTOR is saved in the info.json as extractor_key EXTRACTOR = _("extractor")
EXTRACTOR_KEY = _("extractor_key")
IE_KEY = _("ie_key") IE_KEY = _("ie_key")
EPOCH = _("epoch") EPOCH = _("epoch")
CHANNEL = _("channel") CHANNEL = _("channel")