From fd5d8b5bb558ec8c69fcdfeefcd1d9e02e2947eb Mon Sep 17 00:00:00 2001
From: Qualis Svagtlys <45446348+Svagtlys@users.noreply.github.com>
Date: Thu, 14 Dec 2023 12:49:50 -0600
Subject: [PATCH] Keep EXTRACTOR available but use KEYs

---
 src/ytdl_sub/entries/base_entry.py       | 6 ++++--
 src/ytdl_sub/entries/variables/kwargs.py | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/ytdl_sub/entries/base_entry.py b/src/ytdl_sub/entries/base_entry.py
index cd56df20..da397859 100644
--- a/src/ytdl_sub/entries/base_entry.py
+++ b/src/ytdl_sub/entries/base_entry.py
@@ -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 EPOCH
 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 TITLE
 from ytdl_sub.entries.variables.kwargs import UID
@@ -100,12 +101,13 @@ class BaseEntryVariables:
         Returns
         -------
         str
-            The ytdl extractor name
+            The ytdl extractor key
         """
         # pylint: disable=line-too-long
         # Taken from https://github.com/yt-dlp/yt-dlp/blob/e6ab678e36c40ded0aae305bbb866cdab554d417/yt_dlp/YoutubeDL.py#L3514
         # 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
     def epoch(self: "BaseEntry") -> int:
diff --git a/src/ytdl_sub/entries/variables/kwargs.py b/src/ytdl_sub/entries/variables/kwargs.py
index 7e37ce57..35a656cc 100644
--- a/src/ytdl_sub/entries/variables/kwargs.py
+++ b/src/ytdl_sub/entries/variables/kwargs.py
@@ -51,8 +51,9 @@ SPONSORBLOCK_CHAPTERS = _("sponsorblock_chapters", backend=True)
 SPLIT_BY_CHAPTERS_PARENT_ENTRY = _("split_by_chapters_parent_entry", backend=True)
 COMMENTS = _("comments", backend=True)
 UID = _("id")
-EXTRACTOR = _("extractor_key") # EXTRACTOR is saved in the info.json as extractor_key
-IE_KEY = _("ie_key")  
+EXTRACTOR = _("extractor")
+EXTRACTOR_KEY = _("extractor_key")
+IE_KEY = _("ie_key")
 EPOCH = _("epoch")
 CHANNEL = _("channel")
 CHANNEL_ID = _("channel_id")